environment detection
manual merge
database info override
spelling error
test
Small changes
Spelling/Grammar changes
manual merge
deleted unused files
Merge pull request #44 from TandasCodeup/travis

Small Changes + Database info & Environment Detection