Trying to commit so we can pull
Merge branch 'master' of https://github.com/studybuddyuf/studybuddy

Conflicts:
	django/studybuddy/schedulePage/templates/schedulePage.html~
fixing error