commited trying to pull
Merge branch 'master' of https://github.com/n-critser/235CS.git

Conflicts:
	235.Sort/a.out
	235.Sort/main.o
cleaned up with new mergesort