basic calendar functionality
events show up on calendar from GET /fullcalendar/events/get_events
merged with models to work on studygroup controller
studygroup form created that adds to calendar but not model database
Merge branch 'calendar' into models

Conflicts:
	app/controllers/users_controller.rb
	app/views/welcome/index.html.erb
	config/routes.rb