asdada
asdad
Merge branch 'rama'

Conflicts:
	adios.txt