added parsing and scanning module; lots of paper stuff, make.sh, pdf, etc.
fixed merge in context free grammar