roll back
rb2
Merge branch 'gh-pages' of https://github.com/Fhnx/2048 into gh-pages

Conflicts:
	index.html