Merge branch 'master' of https://github.com/xmarston/LotoLuck
Merge branch 'master' of https://github.com/xmarston/LotoLuck
Merge branch 'master' of https://github.com/xmarston/LotoLuck
Actualizacion de xmartson

Actualizacion de xmartson
Merge branch 'pr/6'

Conflicts:
	js/controllers/controllers.js
	templates/games/20/list.html
	templates/games/20/template.html
	templates/games/21/list.html
	templates/games/21/template.html
	templates/games/4/list.html
	templates/games/4/template.html
	templates/games/catlot.html