task4
Merge pull request #295 from fett2008/week_4

task4