Merge articuloDAO
Merge branch 'master' of https://github.com/jcarlos7121/Grupo-Players

Conflicts:
	controllers/articulocontroller.php
	controllers/pruebatest.php
	dbc/articulosDAO.php
	templates/registrarr.handlebars