en ingles pues viejo
Merge branch 'master' of https://github.com/betoesquivel/sitnconquer