another addition
Merge pull request #2 from coffee-and-code/master

another addition
Merge pull request #3 from mattseburn/dev

merge to dev