chapter 6 finished
Merge branch 'modeling-users' of github.com:tosmi/railstut_sample_app into modeling-users

Conflicts:
	app/models/user.rb
	test/models/user_test.rb