add travis.yml
Merge branch 'master'