colors now working
recurring events now working
Added unscheduled study group view and routes
cleaned up
one more small fix
Merge pull request #35 from dkumar/calendar_coloring

Calendar coloring
font calendar done
Fixed failing UI tests
small bug fix to calendar coloring: colors now stay consistent
Merge branch 'master' of https://github.com/dkumar/MeetMyClassmates

bug fix for coloring-colors now stay consistent
fixed conflicts.. maybe?
ui testing
Merge pull request #34 from dkumar/unscheduled_view

Unscheduled view
Merge pull request #36 from dkumar/fontFix

font calendar done
Merge branch 'master' into messages

Conflicts:
	app/views/layouts/_constant.html.erb
	app/views/studygroups/show.html.erb
	config/routes.rb