sdfghjkl
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/app/src/main/res/layout/activity_main.xml
Merge branch 'master' of https://github.com/thibaultbarillet/supervision_app

Conflicts:
	MyApplication/app/src/main/res/layout/activity_main.xml