added jquery to index
merge conflicts
merge conflicts
merge
index.js nonsense