challenge 02: add tests and solution
fix typos
Add task 02
Add solution and full tests for task 01
Merge with upstream master