Merge branch 'master' of C:\Users\Matt\Desktop\Mive2\SportsBuddy_Android with conflicts.
Merge remote-tracking branch 'origin/master'
Fragment route update