Merge branch 'challengeTeamIntoDev' into Developer-Branch

Conflicts:

FitTogether/FitTogether.xcodeproj/project.xcworkspace/contents.xcworkspa
cedata

FitTogether/FitTogether.xcodeproj/project.xcworkspace/xcshareddata/FitTo
gether.xccheckout

FitTogether/FitTogether.xcodeproj/xcuserdata/MattSides734.xcuserdatad/xc
schemes/FitTogether.xcscheme

FitTogether/FitTogether.xcodeproj/xcuserdata/MattSides734.xcuserdatad/xc
schemes/xcschememanagement.plist

FitTogether/fittogethertwo.xcodeproj/project.xcworkspace/xcshareddata/Fi
tTogether.xccheckout

FitTogether/fittogethertwo.xcodeproj/xcuserdata/CJ.xcuserdatad/xcschemes
/xcschememanagement.plist

FitTogether/fittogethertwo.xcodeproj/xcuserdata/MattSides734.xcuserdatad
/xcschemes/FitTogether.xcscheme

FrontEnd/Dashboard/Dashboard/Dashboard.xcodeproj/project.xcworkspace/con
tents.xcworkspacedata
	Tests/jsonTest/jsonTest.xcodeproj/project.pbxproj

Tests/jsonTest/jsonTest.xcodeproj/project.xcworkspace/contents.xcworkspa
cedata

Tests/jsonTest/jsonTest.xcodeproj/project.xcworkspace/xcshareddata/jsonT
est.xccheckout

Tests/jsonTest/jsonTest.xcodeproj/xcuserdata/MattSides734.xcuserdatad/xc
schemes/jsonTest.xcscheme

Tests/jsonTest/jsonTest.xcodeproj/xcuserdata/MattSides734.xcuserdatad/xc
schemes/xcschememanagement.plist