Merge branch 'master' into gh-pages

Conflicts:
	index.html
	style/main.css
Merge branch 'gh-pages' of https://github.com/fsosa/Protoss2048 into gh-pages

Conflicts:
	index.html
	style/main.css