merge conflict in resturants controller spec
Merge branch 'develop'
Merge branch 'master' of github.com:rubenkostucki/nomnivor
Merge branch 'develop'
adds new logos and updates the hero section with new logo, tagline and larger buttons

Conflicts:
	app/views/map/_action_call.html.erb