panel bug fixed
Merge branch 'master' of github.com:tjbwyk/infovis

Conflicts:
	js/panel.js