Fix commit
Merge https://github.com/Teodor92/University

Conflicts:
	Java/04. JavaSorter