Red
Blue on master
Merge branch 'conflict1'

Conflicts:
	fix.txt
Submodules addition