Add some instructions for fixing common git problems
This includes updated to the latest master. To help with that, I added an alias to SetupForDevelopment.sh to update the master branch regardless of what branch you are on.
This includes updated to the latest master. To help with that, I added an alias to SetupForDevelopment.sh to update the master branch regardless of what branch you are on.