Merge pull request #35 from TandasCodeup/travis

The Great Merge