Initial commit
fileB
Merge branch 'B-master'

Conflicts:
	README.md