Updated Database
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov
Merge pull request #7 from mbathletes/orlandov

Orlandov - Merged databases.
made mock up user profile
made user profile
Merge pull request #8 from mbathletes/dylan

Dylan
Created navbar views
Navbar views created