conflict resolved now
Merge pull request #73 from emocentmagar/krazz

conflict resolved now