git workflow: added pre-merge rebase instructions
Merge pull request #30 from Clever/add-rebase-workflow

git workflow: added pre-merge rebase instructions