Dan's first commit
Merge pull request #6 from dclarizio/master

Dan's first commit