I STARTED A REBASE AND NOW I HAVE NO IDEA WHAT'S GOING ON HALP
Wow, I actually did a rebase! go me!
OH GOD OH GOD OH GOD OH GOD
Merge branch 'master' of https://github.com/Swarthmore/VisualizingTranslations into code-mirror
Merge branch 'master' of https://github.com/Swarthmore/VisualizingTranslations into code-mirror

Conflicts:
	dev/_/components/js/sourceView.js
Add padding to body (fix navbar)
Remove extraneous containers
Make codemirror fit to poem size
* dev/index.html: Misc cleanup
fix offset bug
Merge branch 'side-by-side' of https://github.com/Swarthmore/VisualizingTranslations into code-mirror

Conflicts:
	dev/index.html
Merge pull request #45 from Swarthmore/code-mirror

Make codemirror fit to poem size