:P
Merge branch 'master' of https://github.com/scferrada/sorting.git

Conflicts:
	Sorting.ipr
	src/experiment/ArrayGenerator.java