implemented new content and fixed miniMap feature
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned

Conflicts:
	CocoonedTiled/.DS_Store
	CocoonedTiled/Objects/runeCollision.lua
	CocoonedTiled/Objects/waterCollision.lua
	CocoonedTiled/collisionDetection.lua
	CocoonedTiled/gameLoop.lua
	CocoonedTiled/levels/four.lua
	CocoonedTiled/loadLevel.lua
	CocoonedTiled/mapdata/.DS_Store
	CocoonedTiled/mapdata/art/.DS_Store
	CocoonedTiled/mapdata/art/SnowWall5.png
	CocoonedTiled/objects.lua
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned

Conflicts:
	CocoonedTiled/.DS_Store
	CocoonedTiled/Objects/waterCollision.lua
	CocoonedTiled/collisionDetection.lua
	CocoonedTiled/gameLoop.lua
	CocoonedTiled/levels/two.lua
	CocoonedTiled/mapdata/.DS_Store
	CocoonedTiled/mapdata/levels/2/L.json
	CocoonedTiled/mapdata/levels/2/tmx/L.tmx
fixed errors
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned