Merge branch 'CMA' of https://github.com/tjbwyk/EC_VU_2014

Conflicts:
	src/MainClass.txt
add a carriage return in cmanifest