n^2 sort
Merge branch 'master' of https://github.com/Starzu/ASD

Conflicts:
	.gitignore