Merge pull request #76 from mbathletes/andres

Andres
merge master
merge master
Merge pull request #77 from mbathletes/orlandov

Orlandov
changed ncaa approved to something else
Merge branch 'master' of https://github.com/mbathletes/mbathletes into dylan
Merge pull request #78 from mbathletes/dylan

Dylan