added .travis.yml file
include the file this time
merge master