Solve merge conflict

.gitignore

CHANGELOG.md

CONTRIBUTING.md

LICENSE

README.md

bin/.gitignore

data/.gitignore

doc/.gitignore

doc/Makefile

doc/TP_computational_biologists.md

doc/TP_experimental_biologists.md

doc/available_tools.md

doc/getting_started.md

doc/img/fork.png

doc/img/merge_request.png

doc/img/webide.png

doc/mail.txt

doc/nf_projects.md

public/TP_computational_biologists.html

public/TP_experimental_biologists.html