week 7
Merge pull request #7 from UWE-Ruby/master

week 7