umd-mith/OACVideoAnnotator — pull request #26 by jdickie (2012-04-03 18:24:13+00:00)
Title: Merging changes post-break

Most of these commits are from edits to the documentation that Jim Smith wrote and/or correcting merge conflicts. An extra job that I performed was doing some minor cleanup in outro.js to get rid of unnecessary controllers which I used during testing, such as TimeSlider.