php comments
Merge branch 'master' of https://github.com/nickmccarthy/office_hours
Merge branch 'master' of https://github.com/nickmccarthy/office_hours

Conflicts:
	dashboard.php
Adding php comments, and change name of search location in form