initial commit
Merge pull request #1 from mousepotato/master

initial commit