Merge pull request #10 from mysterio56/master_dev

Master dev, to master qa
add otro comentario desde github
Merge branch 'master_qa' of https://github.com/mysterio56/AR into master_qa
solucion de conflicto qa merge dev
conflicto desde github for windows
solucion de conflicto
Merge branch 'master_dev' of https://github.com/mysterio56/AR into master_dev