will be overwritten
Merge branch 'master' of github.com:wguedes01/FavoriteSport
updated readme file
fixed conflicts