Second commit of Programming Assignment 2