bugfix
Merge branch 'master' of github.com:maxko87/zinc_homepage