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

Conflicts:
	FellowshipOfTheGrammar/bin/GRule.class
Fixed moar

Signed-off-by: Kurios <kuriosly@gmail.com>
Merge branch 'master' of https://github.com/Kurios/LordOfThe

Conflicts:
	FellowshipOfTheGrammar/bin/GRule.class