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

Conflicts:
	home.php
	process_sign_up.php
	sign_up.php