finished designing talk
merging tues afternoon late

Merge branch 'master' of github.com:sociam/zooniverse-history
finished designing talk