Parser + test
Merge branch 'master' of https://github.com/Entena/Project4
Seems we have a conflict