updateses
Merge branch 'master' of https://github.com/rceballos98/athleticsWeb
CSS
merge fix