fixed bugs
fixed video upload bug
fixed conflicts
Merge pull request #75 from mbathletes/dylan

Dylan