SECOND COMMIT FROM NOUT
Merge remote-tracking branch 'origin/master'

Conflicts:
	JavaTest/src/main/App1.java