jquery problem
conflict solved
Merge branch 'master' of https://github.com/bivinvinod/punch
.svn deleted