Initial commit
Rough prototype of Grammar class
Merge remote-tracking branch 'origin/master'