almost
Merge /home/none/osh/9

Conflicts:
	olib/__init__.py
	olib/console.py