Traps deal damage
Merge fied
Merge branch 'master' of https://github.com/guerre50/ggjtest

Conflicts:
	test/Assets/Prefabs/camera.prefab
	test/Assets/Scripts/GUI.cs
	test/Assets/Scripts/Logic.cs
	test/Assets/Scripts/Prota.cs