Added a test to verify there are no conflicts in the grammar
Merge pull request #67 from alex/no-conflicts

Added a test to verify there are no conflicts in the grammar