conflittt
Merge branch 'master' of https://github.com/Jackalex36/infmobile_android_tp2