Estado de computador portatil

Signed-off-by: MigdaliaMedina <migdaeme@gmail.com>
Merge branch 'master' of
https://github.com/williamjmendoza/sigecost2.git

Conflicts:
	formulario/config.php