add database functionality to For Restaurants
Merge branch 'master' of https://github.com/FoodCircles/food_circles

Conflicts:
	app/views/socialbutterflies/index.html.erb
add correct links for nav bar
add for companies and update navigation bar
Merge branch 'master' of https://github.com/FoodCircles/food_circles

Conflicts:
	app/assets/images/companies/companies-chat.png
	app/assets/images/companies/companies-chatapp.png
	app/assets/images/companies/companies-coordinate.png
	app/assets/images/companies/companies-invite.png
	app/assets/images/companies/companies-tracking.png
	app/assets/stylesheets/companies.css.scss
	app/controllers/students_controller.rb
	app/views/companies/index.html.erb
	app/views/students/index.html.erb
	log/development.log
fix merge conflict
add email and database function to students and companies
finish adding database functionality and basic error checking
trying to merge changes
Merge branch 'master' of https://github.com/Siesna/food_circles

Conflicts:
	log/development.log
importing scripts from most recent homepage