minor
Merge branch 'master' of github.com:richardliu12/temporary
improvements to catalyst assembly
Merge branch 'master' of github.com:richardliu12/temporary

Conflicts:
	macrocycle_draw/Molecule.java