config file
Merge pull request #1 from jskovgaard9/master

config file