updated grammar file and .gitignore
updated grammar file and .gitignore
Merge branch 'master' of github.com:Fr3ddaz/ccp14