creating conflict from feature/cool6
adding moo.txt
Merge branch 'feature/cool6' into develop

Conflicts:
	hello.txt