vertakking fileB added
mutual fileA edited
Merge branch 'vertakking'
after entropy battle