Merge remote-tracking branch 'origin/pre-alpha' into pre-alpha

Conflicts:
	First Try/firsttest_Data/output_log.txt