Merging
Merge branch 'master' of github.com:DamagedPandaGame/Cocooned

Conflicts:
	.DS_Store
	Cocooned-master/.DS_Store
	Cocooned-master/CocoonedStable/.DS_Store
	Cocooned-master/CocoonedStable/Loading/loadLevel.lua
	Cocooned-master/CocoonedStable/levels/four.lua