updates
Merge branch 'master' of github.com:unknownArtist/SportsWebsite
Merge branch 'master' of github.com:unknownArtist/SportsWebsite
Merge branch 'master' of github.com:unknownArtist/SportsWebsite
Merge branch 'master' of github.com:unknownArtist/SportsWebsite
Merge branch 'master' of github.com:unknownArtist/SportsWebsite
updates
merge conflicts are fixed
Merge branch 'master' of github.com:unknownArtist/SportsWebsite