Err I can't remember
Merge branch 'master' of https://github.com/lockan/Group5Repo

Conflicts:
	GradeTracker/js/CourseGrades.js
	GradeTracker/js/dummy.js