Merge pull request #72 from mbathletes/dylan

Dylan
Grammer correction
Merge pull request #73 from mbathletes/andres

Grammer correction
fixed bugs
Changed title on homepage
Merge branch 'master' into andres
Merge pull request #74 from mbathletes/andres

Andres
fixed video upload bug
fixed conflicts