committing so I can pull
Merge branch 'master' of https://github.com/nickmccarthy/office_hours

Conflicts:
	login.php