Merge branch 'TeamTableView' into Developer-Branch
static badges right now
not working collection view
Revert b89ee5f..bc0903b

This rolls back to commit b89ee5fa4f7487f5cae9da8e15360bf81f4c555e.
added team created nav
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
st
Revert 5a27e45..7a0c304

This rolls back to commit 5a27e4519081cc5200f13ed33e13da41e5c56838.
rid of auto nav to join/create team
sad
ss
Revert a54db31..d919490

This rolls back to commit a54db317da52398fe04b83c862e9fec528978cfe.
storyboard stuff
Merge branch 'TeamTableView' into Developer-Branch

Conflicts:
	FitTogether/FitTogether/TeamDataViewController.swift
	FrontEnd/Dashboard/Dashboard/Dashboard/Base.lproj/Main.storyboard
Revert 6bed6cf..f3765c6

This rolls back to commit 6bed6cf7512e103b61f0879f39256bb625765076.
temporary commit

ignore this commit
Merge branch 'Developer-Branch' of https://github.com/FitTogether/FitTogether into Developer-Branch
ignore this commit too

I hate the UI version
Revert "Revert 6bed6cf..f3765c6"

This reverts commit aa54acd30ad72f0531ba552791f76458edba33ef.

Conflicts:
	FrontEnd/Dashboard/Dashboard/Dashboard/Base.lproj/Main.storyboard
--working on dashboard

title