added icewall
Merge branch 'master' of https://github.com/DamagedPandaGame/Cocooned

Conflicts:
	.DS_Store
	Cocooned-master/CocoonedStable/Core/gameData.lua
	Cocooned-master/CocoonedStable/Objects/levelPortalCollision.lua
	Cocooned-master/CocoonedStable/gameLoop.lua
	Cocooned-master/CocoonedStable/levels/1bonus1/bonus.lua
	Cocooned-master/CocoonedStable/levels/1bonus1/bonusGame.lua
	Cocooned-master/CocoonedStable/levels/4_collision/walls.lua
	Cocooned-master/CocoonedStable/levels/5_collision/walls.lua
	Cocooned-master/CocoonedStable/levels/5_collision/water.lua
	Cocooned-master/CocoonedStable/levels/LS_collision/walls.lua
	Cocooned-master/CocoonedStable/mapdata/art/cutscenes/OLD/level1scene0.png
	CocoonedStable/Core/goals.lua
	CocoonedStable/Loading/loadingScreen.lua
	CocoonedStable/Mechanics/collisionDetection.lua
	CocoonedStable/Objects/levelPortalCollision.lua
	CocoonedStable/levels/1_collision/blueWall.lua
	CocoonedStable/levels/1bonus1/bonus.lua
	CocoonedStable/levels/1bonus1/bonusGame.lua
	CocoonedStable/levels/4_collision/walls.lua
	CocoonedStable/levels/5_collision/walls.lua
	CocoonedStable/levels/5_collision/water.lua
	CocoonedStable/levels/bonus.lua
	CocoonedStable/levels/bonusGame.lua
	CocoonedStable/levels/lvlselect_collision/walls.lua
	CocoonedStable/levels/storyborder_collision/border.lua
	CocoonedStable/mapdata/art/TitleScreen.png
	CocoonedStable/mapdata/art/background/2/M.png
	CocoonedStable/mapdata/art/background/LS/LS.png
	CocoonedStable/mapdata/art/background/screens/gameOver.png
	CocoonedStable/mapdata/art/background/screens/levelComplete.png
	CocoonedStable/mapdata/art/cutscenes/OLD/level1Scene3.png
	CocoonedStable/mapdata/art/cutscenes/OLD/level1scene0.png