- bit' of a fix on merge sort
Merge branch 'master' of https://github.com/aut-eng-2014/aut-eng-2014