Merge pull request #49 from deedeelavinder/master

3 commits
moved .travis file