merge
Merge branch 'master' of heroku.com:cs147smilendar into alternate2

Conflicts:
	views/layouts/main.handlebars