jquery testings(nothing important)
minor fixes to the 'what is this' page text
Merge remote-tracking branch 'origin/master'
put jquery stuff on comment so it wont do a thing yet