lots of stuff
Merge branch 'master' of https://github.com/zachliss08/2nd-Classroom

Conflicts:
	getcourses.php
changed file name