chizemite
Merge remote-tracking branch 'origin/master'

Conflicts:
	Assets/Resources/maps/level1_bonus.xml.meta
Merge branch 'master' of https://github.com/Tavrox/4E_Ludum28

Conflicts:
	Assets/Resources/maps/level_3Boss.xml
	Assets/Resources/maps/level_5.xml
	Assets/scenes/3Boss.unity
	Assets/scenes/5.unity
	Assets/scripts/Gameplay/TriggeredDoor.cs