Website/PHP Pages/join_office.php
Merge branch 'master' of https://github.com/AfroBiscuit/CITS2232-Project-CL

Conflicts:
	Website/PHP Pages/office_managercheck.php

	new file:   Website/PHP Pages/join_office.php
	modified:   Website/PHP Pages/searchresults.php
	modified:   Website/PHP Pages/searchresults_admin.php