Added branch/merge def & instructor notes

Added instructor notes to slide 25 and branch and merge definition
slides from swc gloss.md