DOC
Rajustement des conflits, documentation de code terminee
Merge branch 'master' of https://github.com/Youmy001/PokeTap
Merge branch 'master' of https://github.com/Youmy001/PokeTap