Merge branch 'master' of https://github.com/VincentDubois/SpacePenguin
Merge branch 'master' of https://github.com/VincentDubois/SpacePenguin
Merge branch 'master' of https://github.com/VincentDubois/SpacePenguin
Merge branch 'master' of https://github.com/VincentDubois/SpacePenguin
Modification fond + boutons
Merge pull request #11 from AndriyMisyurakA1/master

modele 3d +tex + reglages
Modification fond
Modification fond
project.properties
Résolution conflits
Merge pull request #12 from HernasManon1A1/master

Modification fond
project.properties
Fusion
version1
rajout des fichiers oubliés
ajouts de commentaires en marge
correction projet.properties
Merge pull request #13 from GabrielVSRC/master

correction
ajouts project.properties
Pb fusion résolus