conflict attempt
Merge branch 'master' of https://github.com/borislavml/SoftwareUniversity

Conflicts:
	JavaBasics/test.txt