jqueries
conflict resolved
Merge pull request #21 from emocentmagar/krazz

Krazz