I didn't make any changes, but GIT thinks I did.
Merge branch 'develop' of https://github.com/CST316TeamJ/SportsApp into develop
No more \r