Social coding
Merge branch 'master' of git://github.com/madisonmay13/socode into madisonmay13-master

Conflicts:
	socode.py
Merge things