parsing more or less complete, needs testing
forgot one line
Merge branch 'master' of github.com:wyrllyn/IA1_SystemeExpert