Second week homework
Merge pull request #2 from fabes/feature/home_19_07_2014

Second week homework