Collision working. Locked axis for player. Walls should block player from leaving map now.
Merge branch 'master' of https://github.com/mdirienzo/CandyJam

Conflicts:
	Assets/Resources/x-clip-wall.prefab
	Assets/Resources/y-clip-wall.prefab
	Assets/Scripts/PlayerManager.cs