Merge branch 'master' of https://github.com/Tavrox/4E_Ludum28

Conflicts:
	Assets/scenes/1.unity
	Assets/scenes/1Boss.unity