Merge pull request #7 from Tallepyon/master

expr list added real quick
Perhaps finalized the parser?
Merge remote-tracking branch 'upstream/master'

Conflicts:
	parser.c