Top-nav-2
top nav-4

Conflicts:
	app/css/app.css
	app/index.html
	app/scss/_appstyles.scss
Merge branch 'content'
nav-bar-5
nav-6
nav-7
Merge branch 'top-nav'
Merge branch 'master' of https://github.com/Theilgaard92/test_1
Merge branch 'content'

Conflicts:
	app/css/app.css
	app/index.html
	app/scss/_settings.scss
	dist/css/app.min.css
	dist/images/container.png
	dist/index.html
Revert f1cb2ba..fd7c3a9

This rolls back to commit f1cb2ba39f14a2a9c53c3ff576b1375eb13d3ed8.