2
Merge branch 'master' of https://github.com/ReDiCode/sort_array

Conflicts:
	main.cpp