better inheritance hierarchy
Add inheritance reorganization section
Merge branch 'refs/heads/master' into courselib

Conflicts:
	everyday/2013/02/swarm.py