KRAFOO-1234: this is a demo showing rebase
Merge pull request #461 from leoherbie/f_it_up

KRAFOO-1234: this is a demo showing rebase