Fixed merge conflicts locally

Esther Vogt requested to merge add-team into master

Added teams app to store a coach, athletes, and a name. Not functional atm. Changed frontend for myathletes html to be able to create roster for teams, not fully able to push data to backend, or pull or update from frontend yet.

Merge request reports