Pull changes from broken branch
Merge branch 'UI-not-screwed'

Conflicts:
	frontend/add-meeting.html
	frontend/calendar.html
	frontend/dashboard.html
	frontend/index.html
	frontend/js/calendar.js
	frontend/js/dashboard.js
	frontend/js/examplejson.js
	frontend/js/index.js
	frontend/js/profile.js
	frontend/off-canvas.html
	frontend/profile.html
Merge branch 'master' of https://github.com/hamlim/ShirleysScheduler

Conflicts:
	frontend/add-meeting.html
	frontend/js/profile.js
	frontend/profile.html