task_6 start
task_6 correct answer test
Merge pull request #6 from strettos/task6

task_6 start
fix conflict