Adding function call to ast and parser
Fixing merge conflict

Conflicts:
	ast.mli
Adding function call to ast