.classpath
fixing .classpath
fixing .classpath
Fixing merge.
Merge branch 'master' of https://github.com/dyxliang/ZooTypers.git

Conflicts:
	ZooTypers/tests/.classpath