compte
Merge remote-tracking branch 'origin/master'

Conflicts:
	NowWhatToDo2/WebContent/accueil.xhtml
Merge branch 'master' of https://github.com/CLullaby/NowWhatToDo