fixed merge conflicts
[henge/kiak.git] / www / ms-icon-310x310.png
2017-06-25 kenimproved structure/functionality