GalmanScene changes
Merge branch 'master' of https://github.com/morsdyce/gamejam2014.git

Conflicts:
	Assets/Sprites/Thumbs.db.meta