moved material
colliders for player
Merge branch 'master' of github.com:srecnig/clonecloneclone

Conflicts:
	Assets/Scenes/theGrid.unity