Changed how login and register works
Merge
Merge branch 'master' of https://github.com/Fumler/www-p2

Conflicts:
	pages/pageListing.php