Deleting old branch content before merge
Adding master to develop
Delete .travis.yml