akaltar/mergetest

Testing different branching-merging strategies