messing around with jquery
Merge branch 'master' of https://github.com/bloodhawk/jQuery2