p 080
Merge branch 'master' of github.com:hzd02765/rails3book