made stupid thingds
Merge remote-tracking branch 'origin/master'

Conflicts:
	PINEAPPLE______.py