Merge branch 'master' of https://bitbucket.org/comsw4115/yagl

# Conflicts:
#	codegen.ml
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.


# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# Committer: David Ding <dwding@dwding-macbookpro.roam.corp.google.com>
#
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 1 and 5 different commits each, respectively.
#   (use "git pull" to merge the remote branch into yours)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
#	modified:   TODO.txt
#	modified:   ast.ml
#	modified:   codegen.ml
#	modified:   parser.mly
#	modified:   scanner.mll
#	modified:   semant.ml
#	new file:   tests/run-incompatible2.err
#	new file:   tests/run-incompatible2.y
#
# Changes not staged for commit:
#	modified:   hello_world.y
#	modified:   tests/test-forEach1.y
#
# Untracked files:
#	_build/
#	yagl.native
#
