fixed sort algorithm.
Merge branch 'master' of http://github.com/from-nibly/CS3060

Conflicts:
	assn3/assn3.c