Hopefully complete grammar
Partially correct grammar
Updated grammar, includes abstract types
Updated grammar, includes abstract types
Update README.md
Grammar supports abstract types and annotations, has name conflicts
Merge branch 'Test' of https://github.com/stefanprisca/SnipEditor_MavenBuild into Test
Includes test cases.
Updated grammar and test cases
Revert "Updated grammar and test cases"

This reverts commit 6fc27003e2aa8d1ed51f5e9d9e6abd566b535c2d.
Merge branch 'master' into Test
Solving git-differences
Merge branch 'master' of https://github.com/stefanprisca/SnipEditor_MavenBuild

Conflicts:
	README.md

trying to fix git conflicts