pre-mergecommit
Merge branch 'witness' of https://github.com/Swarthmore/VisualizingTranslations into witness
Merge branch 'witness' of https://github.com/Swarthmore/VisualizingTranslations
Add shuffle icon for transform
add witness view to router, make it work in index
Merge branch 'master' of https://github.com/Swarthmore/VisualizingTranslations

Conflicts:
	dev/_/components/js/router.js
	dev/index.html