added extra stuff
Merge branch 'master' of github.com:bkase/gittalk

Conflicts:
	jumper.js