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

Conflicts:
	configHelper.py
	main.py
Stuff
Fix syntax errors in files
Merge branch 'master' into develop

# By SG60 (4) and sg60 (1)
# Via SG60
* master:
  Fix syntax errors in files
  Stuff
  Stuff!!!!!!
  :q :q
  stuff