Initialisation
Ajout README
Tâches à faire
TODO
TODO in branch todo
added JSF feature
ajout index.html
modified 2 files
Merge branch 'todo'

Conflicts:
	TODO.txt
Merge branch 'interface-web'

Conflicts:
	README.txt
Merge branch 'master' of https://github.com/erikgollot/git-training