added jquery
merged with changes from semiroot
changed ignore