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