initial commit
merged
Merge pull request #1 from jdcc/master

Initial