Fix shift/reduce return, check for S/S conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/cs411/project/pkg2/parser/HashSLRTable.java
Revert grammar.txt to 57208ceca1d60e1382c9a5f2b0a0d00ee64e6820
Add and utilize TypedID and TypedIDOrVoid in grammar