name change conflict
Merge pull request #64 from deedeelavinder/master

name change conflict in .travis.yml