Better error output
Visual merge sort
Merge branch 'master' of github.com:mschenck/scratch