Merged pending fixes
Merge branch 'master' of https://github.com/KentRidge/website

Conflicts:
	assets/css/main.css
	facil_amenities.php
	facil_guest.php
	facil_student.php
	partials/navbar.partial.php
Merge branch 'master' of https://github.com/KentRidge/website