config added
Merge branch 'master' of github.com:jerwheaton/comp3753