Update test.java
Merge branch 'master' of https://github.com/wantdo/testItem.git

Conflicts:
	src/com/wantdo/test.java