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

Conflicts:
	CocoonedTiled/.DS_Store
	CocoonedTiled/mapdata/.DS_Store
	CocoonedTiled/mapdata/art/.DS_Store