commit  26-10-2014 (cristian vidal) avances con historia medica
Merge origin/master