Worked on ast
Merge branch 'master' of https://github.com/YichiLL/4115PLT

Conflicts:
	ast.ml