Complete chapter 6 exercises
Merge branch 'master' of github.com:ewanv/sample_app

Conflicts:
	app/models/user.rb
	spec/models/user_spec.rb