first assignment
Merge pull request #29 from nmarchio/master

first assignment