Added bin to gitignore
Merge branch 'master' into kevin
Fixed PeterStrategy
Merge conflicts in MergeSort