Johanni

Results 2 comments of Johanni

Took me a while to fix my rebasing, but I think I got it now :)

Do I need to squash commits or is it good as is?