Final? commit for Programming Assignment 2