Bah not enough time
Merge branch 'master' of https://github.com/yhchun1992/PixelJam2014

Conflicts:
	PixelJam2014/Assets/Scenes/level1.unity
	PixelJam2014/PixelJam2014-csharp.sln
	PixelJam2014/PixelJam2014.sln
	PixelJam2014/PixelJam2014.userprefs