deleted parserFileName. updated conflicts in parserFile
Merge pull request #18 from philelauria/master

deleted parserFileName. updated conflicts in parserFile