update
Merge branch 'master' of https://github.com/skmpz/NewJava

Conflicts:
	src/A.java