Updated assignment 1 from office hours solution and completed assignment 2