Stuff
Merge pull request #60 from dudeman514/master

Quiz 1