Added branch/merge def & instructor notes

Added instructor notes to slide 25 and branch and merge definition
slides from swc gloss.md
Conflicts came up in one of the hidden internal keynote files (index.zip). I didn't resolve
anything, hopefully this doesn't break anything

Merge branch 'gh-pages' of https://github.com/dtrap/2014-08-14-stanford into dtrap-gh-pages

Conflicts:
	stanford/git/local_git.key/Index.zip
	stanford/git/local_git.key/Metadata/Properties.plist
Merging Dani's final version, hoping not to break anything

Merge branch 'dtrap-gh-pages' into gh-pages
Merge branch 'gh-pages' of github.com:abostroem/2014-08-14-stanford into gh-pages