completed assignment 2
Merge pull request #46 from aburky/master

completed assignment 2