On branch parser
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   ../../Test/SAX/myressax2
	modified:   ../../Test/SAX/testsax.c
	modified:   Makefile
	modified:   gestion_client.c
	modified:   main
	modified:   main.c
	modified:   workflow_struct.h

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	../../PSR.tar
	../../Test/SAX/myressax
	../../Test/SAX/process2.xml
	../../Test/SAX/test
	../../Test/SAX/testressax2
	../Workflow_admin/admin.c
	../../rapport.odt
 On branch parser
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	new file:   parser.c
	new file:   parser.h
	new file:   workflow_struct.c

 Changes not staged for commit:
   (use "git add <file>..." to update what will be committed)
   (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   Makefile
	modified:   gestion_client.c
	modified:   main
	modified:   main.c
	modified:   workflow_struct.h

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	../../PSR.tar
	../../Test/SAX/myressax
	../../Test/SAX/process2.xml
	../../Test/SAX/test
	../../Test/SAX/testressax2
	../Workflow_admin/admin.c
	../../rapport.odt
 On branch parser
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   Makefile
	modified:   gestion_client.c
	modified:   main
	modified:   main.c
	modified:   workflow_struct.h

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	../../PSR.tar
	../../Test/SAX/myressax
	../../Test/SAX/process2.xml
	../../Test/SAX/test
	../../Test/SAX/testressax2
	../Workflow_admin/admin.c
	../../rapport.odt
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   gestion_client.c
	modified:   main.c
	modified:   workflow_struct.h

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	../../PSR.tar
	../../Test/SAX/myressax
	../../Test/SAX/process2.xml
	../../Test/SAX/test
	../../Test/SAX/testressax2
	../Workflow_admin/admin.c
	../../rapport.odt
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   Makefile
	modified:   gestion_client.c
	modified:   main

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	../../PSR.tar
	../../Test/SAX/myressax
	../../Test/SAX/process2.xml
	../../Test/SAX/test
	../../Test/SAX/testressax2
	../Workflow_admin/admin.c
	../../rapport.odt
 On branch parser
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   Makefile
	modified:   gestion_client.c
	modified:   main
	modified:   main.c
	modified:   workflow_struct.h

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	../../PSR.tar
	../../Test/SAX/myressax
	../../Test/SAX/process2.xml
	../../Test/SAX/test
	../../Test/SAX/testressax2
	../Workflow_admin/admin.c
	../../rapport.odt
Merge branch 'parser'
 On branch master
 Changes to be committed:
   (use "git reset HEAD <file>..." to unstage)

	modified:   main
	modified:   workflow_struct.c

 Untracked files:
   (use "git add <file>..." to include in what will be committed)

	../../PSR.tar
	../../Test/SAX/myressax
	../../Test/SAX/process2.xml
	../../Test/SAX/test
	../../Test/SAX/testressax2
	../Workflow_admin/admin.c
	../../rapport.odt