Avance 2:16 pm
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
	src/model/Atiende.java
	src/model/SeRealiza.java
Avance 1 2:22 pm