Added some solutions to 16 and 17. Refactored code.
Answers from 16,17
Added some solution for chapter 06