Mostly finished HW 3
Fixed non-random sampling