?
?
Merge branch 'master' into User-home-page

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb
Merge pull request #3 from ksenna/User-home-page

User home page