merge
Merge branch 'master' of github.com:adam3smith/zotero-workshops

Conflicts:
	Presentations/citation-styles.md