assignment 1
Merge pull request #61 from jfall76/master

assignment 1