added jQuery
merge
merge fix
jquery ftw