Updated the github-usage section to clarify what to do in the event of the master branch getting ahead of yours.
Merge pull request #7 from SEL-Columbia/clarify-merging-scenarios

Updated the github-usage section to clarify what to do in the event of t...