subir cambios 28 09 2014
Merge branch 'master' of https://github.com/zurdo153/SCOI
conflict correccion 28 09 2014