claude est pas beau

no change
Merge remote-tracking branch 'origin/master'

Conflicts:

	MyApplication/app/src/main/java/com/example/thibault/myapplication/MainActivity.java
Merge branch 'master' of https://github.com/thibaultbarillet/supervision_app