reordered
Merge branch 'master' of https://github.com/tegacodes/socialsoftware

Conflicts:
	README.md