Added a merging test file that I'll use to get to know the merging tools

Signed-off-by: Mikkel Urban Kajgaard <muk@trackunit.com>