s/\$/jQuery #no-conflict mode
Merge pull request #3 from pietbrauer/develop

s/\$/jQuery #no-conflict mode