added config file
merge fix
Merge branch 'master' of https://github.com/blyons333/britneylyons