change generator file
Merge branch 'master' of https://github.com/Rameos/PSMG_Team_Okapi

Conflicts:
	blendfiles/generator.blend1