Test
Try to Resolve confilcts
text completed
Merge remote-tracking branch 'origin/LC' into Cao

Conflicts:
	.classpath
	bin/.gitignore