adding some code
some more code
Merge pull request #1 from jyenes/dev

adding config
Merge branch 'feature/feat1' into dev