hw2 branch made + final assignment