int a
Merge branch 'cl'

Conflicts:
	src/main/java/com/cl/App2.java