changes from last repo
Merge pull request #1 from ksenna/login

changes from last repo
Update Gemfile
updated gem file
Merge pull request #2 from ksenna/login

updated gem file
commit
Merge branch 'master' of https://github.com/ksenna/vynl

Conflicts:
	Gemfile
Conflicts
Merge branch 'master' into User-home-page

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb