Merge branch 'master-desktop' of github.com:WalkerMills/personal into master-desktop

Conflicts:
	src/c++/sort.cpp
	src/c++/sort.hh
Merge branch 'master-desktop' of github.com:WalkerMills/personal into master-desktop

Conflicts:
	src/c++/sort.cpp
	src/c++/sort.hh