變成y
Revert "我多了x"

This reverts commit e3d3ec1b4ed1cc03ebd8582fb1e023707d1cb22c.

Conflicts:
	bin/javaApp/Main.class
	src/javaApp/Main.java
復原了
new
Merge pull request #3 from yamaZap/master

pull
又變成x了
Merge pull request #3 from He-WenBin/master

xxx