Gotham, styling fixes
Merge branch 'master' of github.com:frank611/shorthand

Conflicts:
	src/styles/app.scss