modified:   shell.py
Merge branch 'master' of https://github.com/gdisneyleugers/sash

Conflicts:
	shell.pyc