Test commit
Merge branch 'master' of https://github.com/BMarinov/Learning-Java

Conflicts:
	src/com/learningjava/C2HelloJava4.java