Merge pull request #2 from arminakvn/design

Design
Before Sync
Merge branch 'design' of https://github.com/ougrimley/equitabletod into design

Conflicts:
	app/.DS_Store
Merge pull request #8 from ougrimley/design

Design
some image and CSS work
Some CSS and Footer
before merge with ou design
fixed the confs
Merge branch 'ougrimley-design' into design
Merge pull request #3 from arminakvn/design

design fixes
deleted additional css and styles
Merge pull request #4 from arminakvn/design

deleted additional css and styles
ignore these
thumb lines out, added as menu items
fix in the jumbtron and logo
Merge pull request #5 from arminakvn/design

Design
CSS changes, font replacement, general colors
Merge pull request #3 from ougrimley/design

Design
commit before mergee
Merge branch 'design' of https://github.com/arminakvn/equitabletod into design

Conflicts:
	app/assets/stylesheets/apps/main.less
	vendor/assets/stylesheets/custom.css