commit to pull.
Merge branch 'master' of https://github.com/lockan/Group5Repo

Conflicts:
	GradeTracker/js/gt_setup_dynamic.js