Merge branch 'master' of https://github.com/ruby-hacking-guide/ruby-h… · ruby-hacking-guide/ruby-hacking-guide.github.com@3c85843