New rails tutorial app.
Add a note about inheritance.
Fix merge conflict in Inheritance.