Ignore config files
Merge branch 'Daniel'