Being social
Trying to make merge easier
Merge branch 'master' into HEAD

Conflicts:
	socode.py
Merge pull request #214 from wmill/master

Adding my function