Git instructor training

Added a note in novice/git/collab about how "git pull" is a summary command of "git fetch" and "git merge".