test another conflict
Merge branch 'feature/feature-johan' of https://github.com/bluecomgroup/bluecom-git-test into feature/feature-johan

Conflicts:
	feature-johan.txt