multiple playesr
Merge branch 'master' of https://github.com/mdirienzo/CandyJam

Conflicts:
	Assets/Scripts/GameManager.cs
	Assets/Scripts/InputController.cs
I dont even know
Merge branch 'master' of https://github.com/mdirienzo/CandyJam

Conflicts:
	Assets/Materials/trap-kill-lollipop-05.mat
	Assets/Prefabs/Lollipop/Traps/trap-kill-lollipop-05.prefab
	Assets/Prefabs/Player.prefab
	Assets/RMM.unity
	Assets/Scripts/InputController.cs
	ProjectSettings/InputManager.asset
Merge branch 'master' of https://github.com/mdirienzo/CandyJam

Conflicts:
	Assets/Scripts/InputController.cs
controllers
Merge branch 'master' of https://github.com/mdirienzo/CandyJam