Added Bubblesort and Mergesort
Added ShellSort
Merge pull request #10 from FaithForHumans/smittle

Next time, only try to update from the master to the master. I usually merge back.