fix
Merge branch 'master' of https://github.com/sagnew/2048AgainstCancer

Conflicts:
	app.js
Merge branch 'master' of https://github.com/sagnew/2048AgainstCancer