my1.2
Merge branch 'master' of https://github.com/changer2000/chapter3.git

Conflicts:
	src/A.java