Merge pull request #2 from RailsGirlsAuckland/master

Update local branch.
Merge pull request #3 from RailsGirlsAuckland/cats

Merge pull request #2 from RailsGirlsAuckland/master