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
Fix small error
Begin writing tests
Fix small error
Begin writing tests
Merge branch 'sunny' of https://github.com/sunny-mittal/class-project into sunny
Merge pull request #6 from sunny-mittal/sunny

Sunny
basic google maps components, javascript and css split out accordingly
Merge branch 'gabe'
Fix merge conflicts
Fix merge conflicts
Merge branch 'nManos'
added ability for devise to lock users out of the maps page unless signed in.