Solution to Programming Assignment 2

Final version 1.1