config file
Merge pull request #3 from dannymeldrum/master

config file