level design
Merge branch 'master' of github.com:marykw/RBOR
bunch of small things
Merge branch 'master' of github.com:marykw/RBOR

Conflicts:
	editor.cpp
	triggers/level_4.triggers
	triggers/level_9.triggers