swap mode
Merge remote-tracking branch 'origin/master'

Conflicts:
	gamemaker/galactosIntolerant.gmx/galactosIntolerant.project.gmx
	gamemaker/galactosIntolerant.gmx/objects/obj_planet_base.object.gmx