'Map mouseover popups with user info'
Merge branch 'nManos'
Merge branch 'master' of https://github.com/sunny-mittal/class-project

Conflicts:
	app/assets/stylesheets/application.css
	app/models/user.rb