Merge branch 'master' of https://github.com/fmi/ruby-homework
Merge branch 'master' of https://github.com/naymad/ruby-homework