Finished ATEAMS simulations
Merge branch 'master' of https://github.com/nh295/CSER_2015

Conflicts:
	java/src/madkitdemo3/ArchSorter.java
updated archsorter killer
Merge branch 'master' of https://github.com/nh295/CSER_2015

Conflicts:
	m/CSER_load_data.m
Updated selection history save