Added config-file
Merge pull request #1 from emillindau/master

Added config-file