updated
Merge branch 'master' of https://github.com/rjw245/tuftshackS2014
Getting jquery on its feet