week 5 materials
Merge branch 'master' of https://github.com/UWE-Ruby/RailsSpring2014
Merge https://github.com/UWE-Ruby/RailsSpring2014
Homework 5