callunity/merge_rebase

Demonstrating a rebase-centred git workflow