Documentation
Merge remote-tracking branch 'origin/master'

Conflicts:
	duckhunt-master/game/hud.pyc