Commiting to merge with fixed level
Merge branch 'master' of https://github.com/MyEyes/GGJ2014

Conflicts:
	content/VestContent.contentproj
	src/levels/CombiLevel.cs
	src/levels/CombiLevel1.cs
Merge branch 'master' of https://github.com/MyEyes/GGJ2014
Fixed World exchange bug
New masks