Cambios para hacer pull
Merge branch 'master' of https://github.com/RoyMustang/sisep

Conflicts:
	.idea/sisep.iml
	.idea/workspace.xml
Merge branch 'master' of https://github.com/RoyMustang/sisep

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/RoyMustang/sisep

Conflicts:
	.idea/workspace.xml
Merge branch 'master' of https://github.com/RoyMustang/sisep

Conflicts:
	.idea/workspace.xml