Merge pull request #2 from hershal/master

Agenda and typos
updated calendar.js for gcal 3.0

Great timing (sarcasm)
updated calendar.js for gcal 3.0

Great timing (sarcasm)
Merge branch 'master' into production
forgot to resolve this conflict
Merge branch 'master' into production
Merge pull request #6 from hershal/production

Merge master into production