Testing somethings about merging and branching out
more trivial stuff
Removing comments and branching out again