Hw7 branch

ashao: HW7 submission