Cleaned up the restaurant controller
Merge branch 'master' of github.com:amyru/Open_Sesame

Conflicts:
	app/models/restaurant.rb