Merge pull request #57 from TandasCodeup/travis

Travis
merged