More stuff ignored and changed.
Merge branch 'master' of https://github.com/Kurios/LordOfThe.git

Conflicts:
	FellowshipOfTheGrammar/src/GToken.java