jQuery conflict
Merge pull request #3 from humancopy/master

jQuery conflict