setting up travis
Merge branch 'firstbranch'