fixed config
Merge branch 'master' of https://github.com/nkeeslin/Project2