ok
Merge branch 'master' of https://github.com/EGimenez/Test2

Conflicts:
	oto6
	otro