Rules do not need TokenTuples, just the Token Type (as a String). In addition, no rule should have actual integer literals, just the term intlit.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/parser/Rule.java