Six weeks left!
Merge pull request #17 from nolanfilter/JimmyJam

Six weeks left!
Merge branch 'master' of https://github.com/nolanfilter/ProjectDeath into Nolan