branched
fixed semantics errors
fixed semantic errors
incorporated semantic analysis, fixed bugs
prepare for merge