ch6 is done
Merge branch 'modeling-users'6 is done

Conflicts:
	.gitignore
	.idea/workspace.xml
7.0.0
7.0.0.1
7.6
user show page go through test
Merge branch 'sign-up'

Conflicts:
	.idea/workspace.xml
	app/views/users/show.html.erb
	config/routes.rb
nothing1
(some message stating you added .idea to ignored entries)