merge master & readd ga

This commit is contained in:
Gabriele Cirulli
2014-03-10 11:33:06 +01:00
7 changed files with 115 additions and 53 deletions
+5
View File
@@ -22,6 +22,11 @@
<p class="game-intro">Join the numbers and get to the <strong>2048 tile!</strong></p>
<div class="game-container">
<div class="game-message">
<p></p>
<a class="retry-button">Try again</a>
</div>
<div class="grid-container">
<div class="grid-row">
<div class="grid-cell"></div>