aaa

aaa
Update text.txt
Merge branch 'master' of https://github.com/manucv/Consultorio.git into
masterRepository

Conflicts:
	vendor/zf-commons/text.txt