Changed the Athlete schema to have more profile information
Merged data model with server
Comitting merge fixes
Merge branch 'master' of https://github.com/umfoida5/comp4350group5
Working on getting the JSON returned correctly to the profile page