switched to original
switched order
Merge branch 'jim-altdesign' into Original
fixed a bug
changed toa lternate
Merge branch 'master' of heroku.com:smilendar into alternate2

Conflicts:
	views/calendar_event.handlebars
	views/homepage.handlebars
Merge branch 'master' of heroku.com:smilendar into smilendar