some modification in genkroupa
add in method to output coag and frag masses
Merge branch 'master' of https://github.com/chelseah/CORE

Conflicts:
	runcore.py