Second commit for Programming Assignment 2