Merge pull request #1 from naisnouk/html_mockup

Html mockup
working on mockup