first commit
added .travis.yml
fixed gitignore conflict