Arrow Trap in level 2 treasure room
Merge branch 'master' of https://github.com/maschill92/Zeus

Conflicts:
	Assets/Scenes/Level1.unity
	ProjectSettings/Physics2DSettings.asset