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
some image and CSS work
Some CSS and Footer
fixed the confs
Merge branch 'ougrimley-design' into design