Finished assignment2
Merge pull request #76 from vktrsm/master

Finished assignment2