Integrated shuffle code into new branch
Shuffle code and bug fixes
Merge remote branch 'origin/shuffle-two' into fix2

Conflicts:
	codonpdx/calc.py