Just for testing and documenting
modificaciones de base de datos
Merge branch 'master' of https://github.com/alpz13/ProyectoLDAW into Testing
espero que no me heche algo
commit en testing
Merge branch 'master' of https://github.com/alpz13/ProyectoLDAW into Testing
Merge branch 'master' of https://github.com/alpz13/ProyectoLDAW into Testing
Merge branch 'master' of https://github.com/alpz13/ProyectoLDAW into Testing
Todos los casos de uso destinados a mua (oseaseseseseseeeee a Mike) terminados
Correcciones de estilo en casi todo muajajaja
Últimos estios a mensajes y yap!!
Merge branch 'master' of https://github.com/alpz13/ProyectoLDAW into Testing
Update buscarcontroller.php
Merge branch 'allUserCases' of https://github.com/alpz13/ProyectoLDAW into Testing

Conflicts:
	application/views/read_pmView.php
Merge branch 'estiloFinalFinal' of https://github.com/alpz13/ProyectoLDAW into Testing
cambios última hora
espero que no cambie nada
Merge branch 'cambiosUltimahora' of https://github.com/alpz13/ProyectoLDAW into Testing
ultimo testting