made changes to collision detection
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned
create miniMap mechanic
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned

Conflicts:
	CocoonedTiled/.DS_Store
	CocoonedTiled/gameLoop.lua
	CocoonedTiled/mapdata/.DS_Store
	CocoonedTiled/mapdata/levels/.DS_Store
miniMap mechanic
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned