week 2
Merge branch 'master' of https://github.com/lushunshun/tealeaf_rapid_rails