Programming Assignment 2

Changes made; completed assignment