Revert 2038c6b..5629531

This rolls back to commit 2038c6b665df9d1dac87b6ce03d614c3acf0c695.
Revert "Revert 2038c6b..5629531"

This reverts commit 6e48c97e987f976d296e1f0f00bb05e609c1d489.
Revert "Revert "Revert 2038c6b..5629531""

This reverts commit 715f0cc838a844f7098c03989cc74fc26c94a15d.
Revert 5629531..39bdf77

This rolls back to commit 562953138edb84e0fa4eed2b9dcf1e24d0f7cd2c.
Revert b68341c..d239777

This rolls back to commit b68341cfc19d261de69bbd47e29a9fe83ad661ad.
Revert 5629531..77a3741

This rolls back to commit 562953138edb84e0fa4eed2b9dcf1e24d0f7cd2c.
Revert 2038c6b..02456c8

This rolls back to commit 2038c6b665df9d1dac87b6ce03d614c3acf0c695.
Revert "Revert 2038c6b..02456c8"

This reverts commit e8d8c53149b85cbbb409e7a6a82d3ec171dd02d7.
Revert "Merge branch 'master' of https://github.com/Theilgaard92/test_1"

This reverts commit f1cb2ba39f14a2a9c53c3ff576b1375eb13d3ed8, reversing
changes made to 936851e26734d4c0f500d63227a7b68770699c8d.
Revert "Merge branch 'top-nav'"

This reverts commit 2038c6b665df9d1dac87b6ce03d614c3acf0c695, reversing
changes made to e6d1ba4ad9d1d097734f08dcc628c3d858258b45.

Conflicts:
	app/css/app.css
	app/index.html
	app/scss/_appstyles.css
	app/scss/_appstyles.scss
	app/scss/_settings.scss
Images
Revert "Merge branch 'content'"

This reverts commit f87facdd7bd49da7de31a7ad3a4762f7b74295b2.