version 1.0
Merge branch 'master' of github.com:cavenzep/Demo

Conflicts:
	AllSort.java