First Chapter of Rails Tutorial
Merge commit 'f3d5a3de49374a3eac44e377b041d11c84af1c30'