test
Merge branch 'master' of github.com:OchirnyamB/novaweb-mockup

Conflicts:
	index.html
	static/css/styles.css
	static/images/logo.svg