Attempt 2

Ok, a bit confused.  Think I've done the right thing - there was a conflict when I rebased that I ignored.  I've also added an author remote to I should be able to fetch changes straight from your repo - I think.

This is quite fun - I guess with some more practise I'll learn the ropes...