Please pull after rebasing

Hi,

I hope I got things right, because I am still a git beginner,
and I had quite a few conflicts and needed to push --force,
which does not feel right. So please check the commits 
before pulling. 

Yours,
Steffen