week 7
Merge branch 'master' of github.com:UWE-Ruby/RubyFall2014