cute number
Merge branch 'master' of git://github.com/julio/socode into julio-master

Conflicts:
	socode.py