week 7 materials
Pull Week7 from upstream
Merge branch 'master' of https://github.com/UWE-Ruby/RubyWinter2014