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
add menssage in github for windows
conflicto desde github for windows
solucion de conflicto
Update default.js
Update default.js
Merge branch 'master_dev' of https://github.com/mysterio56/AR into master_dev
solucion de conflicto 2
Update default.js
solucion de conflicto 2
Update default.js
conflicto 4
pull origin
Update default.js
solucion de conflicto 5
Update default.js
Merge pull request #16 from mysterio56/master_dev

Update default.js