cambio
Merge branch 'master' of https://github.com/prop2014/java

Conflicts:
	src/domain/CtrlHospital.java
	src/model/Hospital.java
Merge branch 'master' of https://github.com/prop2014/java
Anadida controladora general