about
Merge branch 'master' of https://github.com/gleblebedev/GlobalGameJam2014

Conflicts:
	Game/Model/GameScene.cs