Merged completed assignment with master

Merging completed project with my master branch.