moved travis.yml to the correct folder
Merge branch 'sandbox'