after much trial and error, got the google calendar authentication and information
checkbox minimal functionality
starting to work with pulling the google data into the calendar
Merge branch 'master' of https://github.com/ejohnson44/TeamMeet
Merge pull request #6 from rcrl3/master

Added Template to Calendar
added in labels so that we can have something to visuallt demo tomorrow
Merge branch 'master' of https://github.com/ejohnson44/TeamMeet
added in pacos stuff
updated importing - now creates checkboxes for calendars and displays all busy times in the selection
Merge branch 'master' into google_cal

Conflicts:
	calendar.html
got the importing working!!
working on transferring information form the wizard to the calendar
got it working!! also added in duplicate functionality
Merge pull request #7 from ejohnson44/google_cal

Google cal
edit to readme
Merge branch 'master' of https://github.com/ejohnson44/TeamMeet
added in the group view meeting selection box
changed colors, added email input
final tweaks before taking screen shots for the paper
small fixes