Code Merged From Rohan's Repo. Fixed all the necessary issues

Recommend HTML done, Contact form SMTP needs to enter info in config.php