Merge pull request #1 from OpenScienceWorkshops/master

merge with upstream
added jaidens talk
google doc link
Merge pull request #3 from silky/master

added folder with talks