O
Merge branch 'unstable' of github.com:jmankiewicz/lughos into unstable

Conflicts:
	src/test_gui.cpp
	src/test_gui2.cpp
-