Guidance from the elders
Merge branch 'benevolent_dictator'

Conflicts:
	hoodie.py
Merge branch 'master' of github.com:edran/compsoc-hoodie