changed path
merge
added new configuration
Merge branch 'master' of github.com:wesleykerr/config