Merge pull request #1 from livonthedge/assignment2

assignment 2 required tasks are complete