modified:   assn1/TB_test
	deleted:    assn1/.TB_test.c.swp
	deleted:    assn1/.TB_test.txt.swp
	deleted:    assn1/.textbuffer.c.swp
	deleted:    week3/.BST.c.swo
Merge branch 'master' of https://github.com/vivianho/comp1927
	modified:   week5/mergeSort
	modified:   week5/mergeSort.c
	modified:   week5/mergeSortTiming.sh
	modified:   week5/mergeSortTiming.txt
	deleted:    assn1/.TB_test.c.swp
	deleted:    assn1/.TB_test.txt.swp
	deleted:    assn1/.textbuffer.c.swp
	modified:   assn1/TB_test
	modified:   assn1/TB_test.c
	modified:   assn1/testing.txt
	deleted:    week3/.BST.c.swo
	deleted:    week5/.mergeSort.c.swp
	deleted:    week5/.mergeSortTiming2.txt.swp
	deleted:    week5/mergeSortTiming2.txt
	deleted:    week5/outtime
	deleted:    week5/timing.txt