Added some form of shell sort
Fixed merge errors