chap9 user ok
Merge remote-tracking branch 'origin/master'

Conflicts:
	chap9/shoutbox/lib/user.js
chap9 user ok