Merge remote-tracking branch 'upstream/master'

Conflicts:
	parser.c
Merge remote-tracking branch 'upstream/master'

Conflicts:
	parser.c
tmp1 file printing finished. expr_list fixed
fixed an error with wrong lines commented out in printing to listing file
Merge pull request #8 from Tallepyon/master

Added more to parser.c