Capitalize
Espanol
Merge branch 'A'

Conflicts:
	test.txt