backup

setting up planet mother
Merge branch 'genius'

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