initial commit
Merge pull request #1 from carsonbarlow/dev

initial commit