Main.jade template
Merge branch 'master' of github.com:dbtechO/web

Conflicts:
	views/home.handlebars