fixed bug in bubble sort, added merge sort