further prune table
fix conflic
Merge branch 'master' of https://github.com/dkoes/GLmol

Conflicts:
	src/js/ProteinSurface4.js