commit so i can pull
get basic video upload tests to work; still must figure out routes
get basic video upload tests to work; still must figure out routes
implement WORKING cucumber tests
Merge branch 'devel' of https://github.com/b3h47pte/Annotation-Studio into devel