Forgot to add files :(
Merge branch 'master' of http://github.com/Discordanian/70sdetective