new exercise17
update exercise16
Merge branch 'master' of paquari.com:/~/programming