schedule page update
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy

Conflicts:
	django/studybuddy/schedulePage/templates/schedulePage.html
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy