12
Merge branch 'gh-pages' of https://github.com/dotslash/2048 into gh-pages

Conflicts:
	index.html
	js/html_actuator.js
	style/helpers.scss
	style/main.css
	style/main.scss