Shit part 1
Merge branch 'develop' of https://github.com/Snakybo/Jason into develop

Conflicts:
	Assets/Scenes/Fire Dungeon.unity