db and popup fix
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