initial commit
Merge pull request #4 from ctetreault/master

Initial commit