ingresar y modificar
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/ingresar_maestro.php
Merge branch 'master' of https://github.com/xblacklotus/PTC