resolve conflict
Merge branch 'master' of https://github.com/A5bobot/pokepik
Progression authentification..