Initial Commit

Featuring:
JSON
merging JSON
tests
Merge branch 'master' of github.com:dlaxar/config