DCPython -> DC Python
Merge branch 'legal' of https://github.com/DCPython/dcpython-django into resources_page
Merge branch 'master' into resources_page
edited to create 2 columns, tidied up 'friends' info
Merge pull request #15 from ducklet/resources_page

Resources page