finished part 1
Final Code for Assignment 2.  Includes Part 1 and Part 2