fragment
réparation erreur fragment inscription
Merge branch 'master' of https://github.com/SimonPruneau/LoveBot.git

Conflicts:
	AndroidManifest.xml
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/example/lovebot/MainActivity.java