javascript button styling
javascript styling
Merge branch 'master' of https://github.com/nickmccarthy/office_hours

Conflicts:
	addclass.php
	dashboard.php
	edit_single_hours.php
	inc/addclass_form.php
	search.php