Added tests and travis.yml
.travis.yml conflict solved