massaging more of the intro
conflict
conflict

Merge branch 'master' of github.com:sociam/zooniverse-history
conflict merge