Side Nav Title
update
container picture update
minor changes
perping to merge
images
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