damn

does this fix it?
Merge remote-tracking branch 'origin/master'

Conflicts:
	Builds/GlithGlider_Data/output_log.txt
	ProjectSettings/QualitySettings.asset
Merge remote-tracking branch 'origin/master'

Conflicts:
	Builds/GlithGlider_Data/output_log.txt
	ProjectSettings/QualitySettings.asset