tg toi aussi bitch
Merge branch 'master' of https://github.com/Gaet27/RALB

Conflicts:
	MyApplication4/app/src/main/res/layout/fragment_main.xml
je fais caca