handlebars sync
merge conflict
Merge branch 'master' of https://github.com/ndhoule/dott

Conflicts:
	app/routes/index.js
	app/views/mailbox.handlebars
Merge pull request #9 from magicgrl111/master

stuff