contributing
Merge branch 'master' of git://github.com/codesuela/socode into codesuela-master

Conflicts:
	socode.py