Fixed merge overrriding
Merge branch 'master' of github.com:rceballos98/athleticsWeb

Conflicts:
	seed.pyc