resolving jquery conflicts
Merge pull request #20 from uditk/master

resolving jquery conflicts