Merge pull request #24 from sunny-mittal/sunny

Sunny
added instrument field.
added ability to show all registered users.
'Map mouseover popups with user info'
added menu items and links.
Merge pull request #26 from sunny-mittal/gabe

Gabe
Merge branch 'nManos'
Merge branch 'master' of https://github.com/sunny-mittal/class-project

Conflicts:
	app/assets/stylesheets/application.css
	app/models/user.rb
db and popup fix
made more adjustments to form pages.
Merge pull request #27 from sunny-mittal/gabe

made more adjustments to form pages.
Merge branch 'master' of https://github.com/sunny-mittal/class-project

Conflicts:
	app/models/user.rb
Rubocop errors fix
Merge pull request #28 from sunny-mittal/nManos

N manos
Make some changes