Merge branch 'dev' of https://github.com/si-mikey/tessy
underscore.js and header include for _.js
Merge branch 'master' of https://github.com/si-mikey/tessy

Conflicts:
	lib/views/comps/header.jade