back to where it was
Merge branch 'master' of https://github.com/sunshinelyy/2048

Conflicts:
	style/main.css