Another
Merge branch 'master' of https://github.com/StanDimitroff/Java-Basics

Conflicts:
	new  1.txt