my assignment
Merge pull request #96 from jlealtru/master

my assignment