Update socode.py
Merge branch 'master' of git://github.com/GeneralZero/socode into GeneralZero-master

Conflicts:
	socode.py