Merge branch 'Tallepyon-master'

Conflicts:
	parser.c
Stabilized parser

addop/primary code is now stabilized
Merge remote-tracking branch 'upstream/master'

Conflicts:
	parser.c