Added Travis CI
fix merge