fixed collisions
updated player 1 prefab and scene
Merge branch 'master' of https://github.com/tzigrang/ProjectSurvival

Conflicts:
	WorkingCopy/Assets/Scenes/TopDownShooter.unity