Final Version of Assignment 2

Includes better comments