hoping not to clobber
Merge branch 'master' of https://github.com/BrendanBenshoof/CHRONUS

Conflicts:
	CHRONUS/CODE/chordreduce.py
	CHRONUS/CODE/node.py