Merge branch 'feature/rst' into dev
Merge branch 'dev' of https://github.com/CenterForOpenScience/modular-file-renderer into dev
Added docx renderer support
Minor changes, began adding code renderer support
minor changes and began adding code renderer support
Merge branch 'dev' of https://github.com/CenterForOpenScience/modular-file-renderer into feature/docx

Conflicts:
	previewer/main.py
Merge branch 'feature/docx' into dev
Added code renderer support
Merge pull request #36 from kmjungersen/feature/code

Feature/code