creacion .gitignore
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
imagenes de noticias creadas en version PRoduccion
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc

Conflicts:
	ckeditor/kcfinder/upload/images/cuentadiuda1.JPG
	ckeditor/kcfinder/upload/images/cuentadiuda2.JPG
	ckeditor/kcfinder/upload/images/cuentadiuda3.JPG
	ckeditor/kcfinder/upload/images/cuentadiuda4.JPG
renombrado imagenes
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
imagenes y documentos sobre noticias creadas
arreglando conflictoo menu lateral en index
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc
imagenes slider
Merge branch 'master_hmvc' of https://github.com/cristianortiz/investigacionUDA into master_hmvc