full solution to problem 17
initial checkin for problem 18
Merge remote-tracking branch 'origin/master'