fixes for the jumpin issue
Merge branch 'master' of github.com:brownplt/captain-teach

Conflicts:
	web/app/assets/stylesheets/ui.css