Merge branch 'master' of github.com:cpbael/VERSION_AB3L_GROUP4

Conflicts:
	home.php
	process_sign_up.php
	sign_up.php
Semi-final UI
Merge branch 'master' of github.com:cpbael/VERSION_AB3L_GROUP4

Conflicts:
	confirm_reservation.php
	home.php
	process_confirm_reservation.php
	process_sign_up.php