fixed header issue in html
fixed merge errors
Merge pull request #10 from mcivorsteiner/mainpage_login_signup_and_second_page

Mainpage login signup and second page