merge conflicts slides
added pull request slides, start of branches
branches
added glossary, remotes, end slide
changed title page
minor edit
chenged around staging and committing