initial commit
Merge branch 'master' of github.com:dasmolin/conf