Programming Assignment 2

With the changes