commit
stylE mENU
Merge branch 'master' of https://github.com/cmasanett/PHP_RRHH

Conflicts:
	config/autoload/.gitignore
stylE mENU 12:.07