conf
Merge pull request #4 from selliott512/feature/conf

conf2