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

Conflicts:
	game.h
	gui.cpp
	mainmenu.h