initial commit
Merge pull request #1 from mattinm/master

initial commit