Assignment 3

continuing on my good naming streak
Merge pull request #58 from sweves/master

Assignment 3