put content on the course info page
commit to merge
Merge branch 'master' of https://github.com/nickmccarthy/office_hours

Conflicts:
	course_info.php
fetched the office hours for a class and have them point back to the instructor pages
Merge branch 'master' of https://github.com/nickmccarthy/office_hours