Merge branch 'master' of https://github.com/Kurios/LordOfThe.git

Conflicts:
	FellowshipOfTheGrammar/src/GToken.java
Commit This Shitnazi
Attempt 2...
Merge branch 'master' of https://github.com/Kurios/LordOfThe

Conflicts:
	FellowshipOfTheGrammar/bin/GRule.class