Definitive version of the assignment 2

Definitive version of the assignment 2