conflict resolved
Merge pull request #71 from emocentmagar/krazz

conflict resolved