trying rebase instead
Merge pull request #3 from pricels/travis-updating

trying rebase instead