Finished Homework 1 + Extra Credit