Design Changes++
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/app.css
	scss/app.scss
Design Changes++