fixed cmd window from showing
Merge branch 'newstart' into inventory

Conflicts:
	functions.h
	gameplay_functions.h
	mapmaker.h