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