add slide: introduction to merge & rebase
add slide about pull
add information about git-flow
add info about the workshop