files for he 12
Merge branch 'master' of git://github.com/bdsaunders/udods

Conflicts:
	Sorters.h