Delete .travis.yml~
deleting build dir
Merge branch 'dev'