Created a test script for travis to run
Made script executable
Now checking branch name
Added conditional
Merge branch 'master' into feature/travis-pushing
Merge branch 'feature/travis-pushing'