Fixes everything broken by the last push
Merge branch 'master' of https://github.com/cilim/learning-ruby