fixed merge conflicts
[henge/kiak.git] / www / favicon-32x32.png
2017-06-25 kenimproved structure/functionality