added gcal ID to users.json
Merge branch 'master' of github.com:lthrock/cs147_project

Conflicts:
	users.json
Working
Merge branch 'master' of github.com:lthrock/cs147_project

Conflicts:
	routes/events.js
Delete event from Google Calendar
Merge branch 'master' of github.com:lthrock/cs147_project

Conflicts:
	users.json
Merge branch 'master' of github.com:lthrock/cs147_project

Conflicts:
	routes/events.js
Merge branch 'master' of github.com:lthrock/cs147_project
Pass label / timeSpent to Google Analytics