lets you take 1, 2, or 3 second videos
did some UI stuff, improved the cursor adapters
committing so I can merge
committing before merge
merge commit