finish the collapse_data
change the data structure
Merge branch 'master' of https://github.com/kunyuan/DiagMC-time

Conflicts:
	project/inlist