finished Hour 16
Merge branch 'master' of github.com:toniokroeger/c24