delete *.so
dasf
Merge branch 'master' of https://github.com/iagapov/ocelot

Conflicts:
	common/__init__.pyc
	common/globals.pyc
	common/screen.pyc
	gui/__init__.pyc
	gui/accelerator.pyc