Premier Commit
Deuxieme commit
troisieme commit
premier commit test
Commit du conflit
Commit conflit a gerer
commit resolution conflit
Merge branch 'master' of github.com:jsenzier/TPGIT

Commit global