Merge branch 'refactor' of github.com:francisfueconcillo/gameofthegenerals into refactor
Backend refactor