Finish sign in
Merge branch 'master' of https://github.com/tanquyvt/sample_app

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/stylesheets/custom.css.scss
	app/controllers/application_controller.rb
	app/controllers/users_controller.rb
	app/helpers/application_helper.rb
	app/helpers/users_helper.rb
	app/models/user.rb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/shared/_error_messages.html.erb
	app/views/users/new.html.erb
	app/views/users/show.html.erb
	config/database.yml
	config/environments/production.rb
	config/environments/test.rb
	config/routes.rb
	db/schema.rb
	spec/factories.rb
	spec/models/user_spec.rb
	spec/requests/user_pages_spec.rb
	spec/support/utilities.rb