deleted facebook.yml that was in main folder
Implements MVC for js find restauraunt functionality
merge conflict
Merge branch 'mvp_google_api' of https://github.com/banana-slugs-2014/help.me into mvp_google_api

Conflicts:
	Gemfile.lock
	app/assets/javascripts/places.js