New editor
Merge branch 'master' of github.com:marykw/RBOR

Conflicts:
	gui.h
	overworld.cpp