week 3 materials
Merge branch 'master' of https://github.com/UWE-Ruby/RubyWinter2014
undo my stupid pull