started working on ctr z feature
Merge branch 'master' of https://github.com/jensenr30/De_Flux

Conflicts:
	mapmaker.h
	tile_item_functs.h