New design proposal
changes from the meeting tonight
Merge branch 'develop' into new-design

Conflicts:
	eatsmart/static/css/site.css
Merge pull request #131 from codefordurham/new-design

New design proposal