Added monster logic
Merge branch 'master' of github.com:MyEyes/GGJ2014

Conflicts:
	content/VestContent.contentproj
	src/PlayerController.cs
	src/levels/CombiLevel.cs
	src/levels/Level1Evil.cs
	src/levels/Level1Good.cs
	src/levels/TestLevel.cs
	src/levels/VestLevel.cs
	src/state/PlatformingState.cs