add my function
djrausch #HOLO
djrausch #HOLO
Merge branch 'master' of git://github.com/djrausch/socode into djrausch-master

Conflicts:
	socode.py
Merge branch 'master' of git://github.com/sfrnld/socode into sfrnld-master

Conflicts:
	socode.py
Merge branch 'master' of github.com:sricola/socode