Merge branch 'Joe's-Branch'

Conflicts:
	app.js
	templates/scaffolding.hdbs
Merge branch 'Joe's-other-branch'
Revert 5befdab..1bfc9b1

This rolls back to commit 5befdabce063b6e4533ba00986f2484c29b99aeb.
implemented comparison algorithm

Currently you can switch between the two tabs (which i temporarily
renamed) but you can’t switch back to the first one… we’ll need to fix
that.
Merge branch 'Joe's-other-branch'

Conflicts:
	app.js
	templates/scaffolding.hdbs