creating conflict from feature/cool6
Merge branch 'feature/cool6' into integration

Conflicts:
	hello.txt