Merge branch 'master' of https://github.com/UWE-Ruby/RubyWinter2014
Merge branch 'master' of github.com:nbirnel/RubyWinter2014