bootstrap, src dir
fixed merge conflict. travis.yml  deleted