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
Merge branch 'nManos'
Change code placement