Compare commits

...
A pull request between these branches already exists: elia/pokeritup#2

develop-entities #2