working on project settings
Merge branch 'master' of https://github.com/TheSooth/DI
updating .travis.yml