Merge pull request #2 from yaojohnpaul/master

Adjusted CUP to updated Flex file
Merge pull request #3 from yaojohnpaul/master

Updated CUP
Updated CUP with some shift/reduce errors

Integrated my conyo.cup edit with conyo_edit.cup (JP's version)
Merge pull request #3 from Vandenn/master

Merge