no message
merge
Merge branch 'master' of https://github.com/KompAlgToTheMax/SortingAlgorithms

Conflicts:
	src/Main.java