css testing
Merge branch 'gh-pages' of https://github.com/rhythms06/2048 into gh-pages

Conflicts:
	style/main.css