Merge branch 'Neha' of https://github.com/ClementineB/Cocoon into Clementine
Update AST
Merge branch 'Clementine' of https://github.com/ClementineB/Cocoon into lawrence

Conflicts:
	ast/IDLeaf.java
	ast/Node.java
	ast/NumLeaf.java
	ast/ReservedLeaf.java
	calc.y
merge with clementine corrected errors
merge with clementines branch correcting errors
codegeneration recursive
code generation recursive change