new content
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned

Conflicts:
	CocoonedTiled/.DS_Store
	CocoonedTiled/Objects/runeCollision.lua
	CocoonedTiled/levels/one.lua
	CocoonedTiled/mapdata/.DS_Store
	CocoonedTiled/mapdata/art/.DS_Store
	CocoonedTiled/player.lua