some changes
Merge branch 'master' of https://github.com/janon22/testgit2.git

Conflicts:
	src/com/test/Simple.java