Hooked up level 1 first half
preparing for emergency merge
Merge branch 'master' of https://github.com/MyEyes/GGJ2014

Conflicts:
	src/PlayerController.cs
	src/levels/CombiLevel1.cs
	src/state/FlipGameState.cs