test
init depot
first step
pel fragment
ListEvents, categories, Questionnaire
Norme IPictureTaker
Login page
Merge remote-tracking branch 'origin/master'
Merge pelayo
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjectWeek/src/main/AndroidManifest.xml
	ProjectWeek/src/main/java/com/example/projectweek/MainActivity.java
	ProjectWeek/src/main/res/values/strings.xml
Reagencement activities
activity
logout function
activity
Merge remote-tracking branch 'origin/master'
logout function
stupid commit
Un nouveau pas vers le design
mise en place paul
AvisActivity