Merge branch 'master' into ch2
$ b rails generate scaffold Micropost content:string user_id:integer