Merge pull request #54 from mbathletes/dylan

Dylan
Added delete video function and updated registratiion page
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov
Merge pull request #55 from mbathletes/orlandov

Orlandov
included jquery to rid of athletics and academic views. fixed buggs in signin and activation. need to fix nav bar
Merge branch 'master' into dylan