Add basic HTML and CSS
Merge branch 'develop'