solution pour gitignore 
Merge branch 'master' of https://github.com/NitriKx/PTUT-EdT.git

Conflicts:
	src/com/iut/ptut/MainActivity.java