add function joshryandavis
Merge branch 'master' of git://github.com/joshryandavis/socode into joshryandavis-master

Conflicts:
	socode.py