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