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
switched back
merged
changed to alt
Merge branch 'master' of heroku.com:smilendar into smilendar
adding add event button and fixing style again....
d
fixed time bug
take out addevent in menu
fixed time bug