merged
let travis check the tests
added missing files