Merge branch 'nManos'
added ability for devise to lock users out of the maps page unless signed in.
Write more tests and modify User model
Merge pull request #9 from sunny-mittal/gabe

added ability for devise to lock users out of the maps page unless signe...
Fix merge conflict
Merge pull request #10 from sunny-mittal/sunny

Sunny
Removed commented code
Merge branch 'master' of https://github.com/sunny-mittal/class-project into nManos

Conflicts:
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb
	app/views/map/index.html.erb
	config/routes.rb
	log/development.log