Added security, prevents navigating anywhere on the site except the login page until the user is logged in.
fixed merge conflicts
Changed most of the html pages to php pages
deleting the html files