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

Conflicts:
	Assets/Scenes/MaybeTheGameMaybe.unity
Merge pull request #114 from nolanfilter/JimmyJam

Jimmy jam