merge master
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov
Merge branch 'master' of https://github.com/mbathletes/mbathletes into orlandov
Merge pull request #35 from mbathletes/dylan

Dylan
view users. delete mssgs and users. and fixed minor errors
Updated edit profile and profile pages
Updated edit profile and profile pages
created search engine view. made the search bar only available to auth users
created admin users view to display all athlete users. created 3 admins and finished search engine view
Merge pull request #36 from mbathletes/orlandov

Orlandov
Updated the sign-up form to verify input. Added profile verification.
Updated the sign-up form to verify input. Added profile verification.
Merge pull request #37 from mbathletes/andres

Andres
editted admin page with delete functionality and abitlity to add other admins. view coaches and athletes.
fixed conflicts