Fixed scale
Merge branch 'master' of https://github.com/JamiesonWarner/gamejam

Conflicts:
	app/.DS_Store