ntg
conflict
Merge pull request #76 from emocentmagar/krazz

Krazz