Finished Assignment 2

Did not do extra credit :(