first commit
Merge pull request #1 from mrjferg/master

first commit