git guide
add notes on rebase conflicts
Merge pull request #4 from jbancroft/ms-rebase

Ms rebase