added odd cases for merge sort
comment out lines
comment out stuff
optimized
passed normal test
haha
print n
merge
ds
Merge branch 'master' into Experimental_branch_for_odd_cases_in_mergesort

Conflicts:
	pa2x/pa2x.xcodeproj/project.xcworkspace/xcuserdata/tyler.xcuserdatad/UserInterfaceState.xcuserstate