Merge pull request #43 from mbathletes/orlandov

Orlandov
Modified company and team page
Merge branch 'master' into andres
Merge pull request #44 from mbathletes/andres

Andres
fixed errors and bugs and fixed div issues. worked on admin page and adjust some styling and functionality of delete
fixed conflicts
Merge pull request #45 from mbathletes/dylan

Dylan
Added video update forms