images
Merge remote-tracking branch 'origin/master'

Conflicts:
	textures/fireslime.png
	textures/ghostslime.png
	textures/trafficslime.png