added bubble sort and merge sort, fixed comment error in matrix.java