temporary
Merge branch 'master' of https://github.com/dronnix/test
finished 3-d task for chapter 6
First part of task 4, chapter 6
Added [de]serialization for task 4