Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into JimmyJam

Conflicts:
	Assets/Art/Prefabs/Obstacles/FireJet.prefab
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into JimmyJam

Conflicts:
	Assets/Art/Prefabs/Obstacles/FireJet.prefab
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into JimmyJam
heyo
Merge pull request #45 from nolanfilter/JimmyJam

Jimmy jam