update the hw
Merge branch 'master' of github.com:UWE-Ruby/RailsSpring2014
Merge branch 'master' of https://github.com/UWE-Ruby/RailsSpring2014