little changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	scripts/app.js
created a button based on SpriteSheet (slow)