students page
Merge branch 'master' of github.com:rceballos98/athleticsWeb
students working
Merge branch 'master' of github.com:rceballos98/athleticsWeb

Conflicts:
	main.py
merge fix