work from week4's class
Merge branch 'master' of github.com:UWE-Ruby/RubyFall2013