stuff
Merge branch 'master' of http://github.com/SG60/stacksort

Conflicts:
	configHelper.py
	main.py