firehose app
Merge branch 'master' of https://github.com/timmickey/mailbox

Conflicts:
	_old/hbs/application.hbs
	_old/hbs/event.hbs
	_old/hbs/index.hbs
	_old/hbs/mail.hbs
	_old/hbs/mailbox.hbs
	_old/hbs/mailbox:index.hbs
	hbs/application.hbs
	hbs/event.hbs
	hbs/index.hbs
	hbs/mail.hbs
	hbs/mailbox.hbs
	hbs/mailbox:index.hbs
	templates/application.hbs
	templates/event.hbs
	templates/index.hbs
	templates/mail.hbs
	templates/mailbox.hbs
	templates/mailbox:index.hbs