pulling
Merge branch 'master' of github.com:rceballos98/athleticsWeb

Conflicts:
	main.py
	seed.pyc
Working and final