Add note about git rebase
Merge branch 'deadly_skills'

* deadly_skills:
  Add note about git rebase