Merge remote branch 'origin/develop'
Merge branch 'master' of https://github.com/tabosque/sample_app
Merge branch 'filling-in-layout'
Merge branch 'shared-examples'
Merge branch 'check-email'
Merge branch 'sign-up'
Merge branch 'tmp'
Commit fixed
Merge pull request #25 from tabosque/tmp2

Tmp2
Finish Section 7
Merge pull request #27 from tabosque/7-6

Finish Section 7
Finish sign in
Merge pull request #29 from tabosque/sign-in-out

Finish sign in
Merge branch 'develop'

Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/users_controller.rb
	app/views/layouts/application.html.erb
	config/routes.rb
	spec/requests/user_pages_spec.rb