Merge pull request #2 from RailsGirlsAuckland/master

Update local branch.