Added more to parser.c
Merge branch 'Tallepyon-master'

Conflicts:
	parser.c
Stabilized parser

addop/primary code is now stabilized