Commits
Merge branch 'master' of https://github.com/Discordanian/70sdetective

Conflicts:
	app/edetect.js