Correcting contact.php
Removing php auth, switching to .htaccess
Merge
Correcting