Delete New File
Create fifi
Update fifi
Merge pull request #1 from eclar/flo

Flo
bug fix
Merge branch 'master' into bug_fix

Conflicts:
	ProjetInitiationGitHub/src/toto/Titi.java
Merge remote-tracking branch 'origin/master'
ToDelete deleted with git rm
Merge branch 'master' into fileDeletedBetter
New class, new method, new branch
New method random
added variable
Merge branch 'plo' of https://github.com/eclar/GitInitiationEmn into plo

Conflicts:
	ProjetInitiationGitHub/src/toto/Plop.java