Fixed player prefab, added player list (generic), changed death to be done via game manager. fixed traps
Merge branch 'master' of https://github.com/mdirienzo/CandyJam

Conflicts:
	Assets/Scripts/GameManager.cs
	Assets/Scripts/InputController.cs