Revert 2038c6b..5629531

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

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

This reverts commit 2a70483cac862cf958df554321f9a3a006a5588f.
Revert "Revert "Revert "Revert 2038c6b..5629531"""

This reverts commit 55d3c2e96f44db5f6341446434555d321c06685d.
Merge branch 'content'

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
Revert "Merge branch 'content'"

This reverts commit f87facdd7bd49da7de31a7ad3a4762f7b74295b2.
Merge branch 'content'

Conflicts:
	app/css/app.css
	app/index.html
	app/scss/_appstyles.scss
	app/scss/_settings.scss
	dist/css/app.min.css
	dist/images/container.png
	dist/index.html
Revert "Merge branch 'content'"

This reverts commit c05900b246de9577663a15f9e1b23bc87d251e6f, reversing
changes made to 4a949f7bff2dbd8629972b488757d0fa9cb51b3e.
Merge branch 'master' into content
Revert "Merge branch 'master' into content"

This reverts commit ab733688b684764cf8cdc80b00ec9392edaf055a, reversing
changes made to 93e270db9921bf30308ab642f8e06e732bdf1963.
added  icons file