use local files
Merge branch 'master' of https://github.com/pragmagrid/docs

Conflicts:
	nsf-nsfc/2011/presentations.md