commit
Merge branch 'nojQuery'