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

Conflicts:
	src/MainClass.txt
add a carriage return in cmanifest
在player19中添加main()
Merge branch 'master' of https://github.com/tjbwyk/EC_VU_2014
reset some files to the version they should be
delete some useless files