frist page almost done
Merge branch 'jeremy'
Merge branch 'master' of github.com:angelali92/midnightmunchies

Conflicts:
	app/assets/stylesheets/application.css.scss
	app/assets/stylesheets/scaffolds.css.scss
	app/views/eateries/index.html.erb