Restore of files after troubles
Merge branch 'master' of github.com:CoenKuij/sample_app

Conflicts:
	app/controllers/users_controller.rb
	app/models/user.rb
	app/views/users/show.html.erb
	db/schema.rb
	spec/factories.rb
	spec/models/user_spec.rb
	spec/requests/user_pages_spec.rb