pre pull cleanup
Merge branch 'master' of https://github.com/sunny-mittal/class-project into nManos

Conflicts:
	Gemfile.lock
	config/routes.rb
	db/schema.rb
basic google maps components, javascript and css split out accordingly
Fix merge conflicts
Merge branch 'nManos'