Commit davant le raquetball
Blabla

Merge remote-tracking branch 'origin'

Conflicts:
	DareIt/AndroidManifest.xml
	DareIt/gen/com/example/dareit/R.java
	DareIt/src/com/example/dareit/CameraFragment.java
	DareIt/src/com/example/dareit/ConversationsDraft.java
	DareIt/src/com/example/dareit/MainActivity.java
	DareIt/src/com/example/dareit/MyAdapter.java