Finish layout and routes
Merge branch 'master' of https://github.com/yama3/sample_app

Conflicts:
	app/assets/stylesheets/custom.css.scss
	app/controllers/static_pages_controller.rb
	app/controllers/users_controller.rb
	app/helpers/users_helper.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_header.html.erb
	app/views/layouts/application.html.erb
	app/views/users/new.html.erb
	config/routes.rb
	spec/requests/static_pages_spec.rb
	spec/requests/user_pages_spec.rb