Completed

Completed version of assignment2