cambios
mucho errror
Merge branch 'master' of https://github.com/darkbreaker/cc409

Conflicts:
	controller/ArticuloCtl.php