added 2013-12-02-ndc-diary-pre-conference-workshop-1.md
Merge branch 'master' into ph