Updated about file from urllib3 to requests
Merge branch 'master' into timeline_look

Conflicts:
	hogwarts/marauder/templates/about.html