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

Conflicts:
	editor.cpp