Assignment2 Final

Now with Extra Credit