changes
conflict resolved
bug solved
Merge pull request #114 from emocentmagar/krazz

Krazz