updated
merged conflict
checked
checked
add new sort
merge_sort added, couple of changes inside others
.sh added
Merge branch 'master' into merge_sort

Adding run.sh
cleared
Merge pull request #4 from nagado/merge_sort

Merge sort