add gitignore
push UploadTest
Merge branch 'master' of https://github.com/Cliko/ProjetXtreme

Conflicts:
.gitignore
up