Fix and improve parser for stage 3.
Merge branch 'master' of https://github.com/trbecker/comp-2014-1

Conflicts:
	parser.y
	src/comp_ast.c
Remove print.