updates from class
Merge branch 'master' of github.com:UWE-Ruby/RubyWinter2014