Merge pull request #78 from nolanfilter/JimmyJam

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