housekeeping
Merge branch 'master' of https://github.com/oafridi/ruby_dev