Merge branch 'master' of https://github.com/zmoffitt/s4115

# Conflicts:
#	src/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.
# On branch master
# Your branch and 'origin/master' have diverged,
# and have 15 and 1 different commit 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:   codegen.ml
#	modified:   semant.ml
#
# Untracked files:
#	../microc-llvm/tests/test-putchar.mc
#	../rui-08-06.patch
#	_build/
#	a.out
#	add.ll
#	extern.diff
#	main.ll
#	main_w_std.ll
#	main_w_std.sct
#	main_wo_std.ll
#	main_wo_std.sct
#	simplicty
#	stdio.ll
#	stdio.sct
#	test-array-access.sct
#	test-crossassign.sct
#	test-extern-add.sct
#	test-extern-main.sct
#	test-getchar.sct
#	test-struct-decl.sct
#	tmp.ll
#
