Merge pull request #28 from elenasa/master

Catch up
Merge pull request #29 from elenasa/master

self is atom type inside quark functions
Updated grammar
Merge pull request #12 from DaveAckley/master

updated grammar