check

asdad
Merge branch 'master' of https://github.com/janfranco27/TheProyect

Conflicts:
	ManagerM/managerm.log