updated some branding
Merge branch 'master' of https://github.com/bradoyler/gitflow
Merge branch 'master' into header-login-styles

# By Ian Rose
# Via Ian Rose
* master:
  updated some branding

Conflicts:
	app/styles/modules/_logo.scss
	app/templates/application.hbs