added travis.yml
Merge branch 'add-travis', remote-tracking branch 'origin'