first commit
Merge pull request #22 from umassgit/master

first commit