Added Calender
Merge branch 'master' of https://github.com/brendancarney/TeamDStudentPortal
Merge branch 'master' of https://github.com/brendancarney/TeamDStudentPortal

Conflicts:
	app/views/events/index.html.erb