email bar
added lines for heroku
testing gemfile for heroku
Fixed ruby version for heroku
ready to pull
Merge branch 'master' of github.com:angelali92/midnightmunchies
making it the same
User authentication incorporation
cleaned up routes.rb file
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
made inages iewable and cleaned up index table
fixed merge conflicts
Welcome Page finished and starting favorites
Added a column filter
Merged files
small change to show.html
Merge branch 'master' of github.com:angelali92/midnightmunchies
Favorites is done, for now :P
Added Favorite Validation and Deletion