Commit ingreso y cita
Merge branch 'master' of https://github.com/XuUmSdBvOUZd4KtSNwzb/Ejb

Conflicts:
	CitaEjb.java
	CitaImpl.java