restored to non cal tri data
modified readme
end of ch6
restored to sample app text
modified back to original
Merge branch 'modeling-users'

Conflicts:
	app/views/layouts/_footer.html.erb
	app/views/static_pages/home.html.erb
fix merge