Finished Programming Assignment 2

Finished programming assignment 2 for peer review.