added jquery/changed stuff
Merge branch 'master' of https://github.com/mpwoz/site-tracker
merge