added jointed stuff doesn't work
Merge branch 'branch' into Developer-Branch
cost results type
Merge branch 'create-team-cloud' into Developer-Branch

Conflicts:
	FitTogether/FitTogether/CreateTeamViewController.swift
	FrontEnd/Dashboard/Dashboard/Dashboard/Base.lproj/Main.storyboard
added appIcons
app icon
all orange and black now
Merge branch 'stylingDashAndIconsAndStuff' into Developer-Branch

Conflicts:
	FrontEnd/Dashboard/Dashboard/Dashboard/Base.lproj/Main.storyboard
fixed conflicts
team page only shows your team members
Merge branch 'dashUpgrades' into Developer-Branch
Merge branch 'create-team-cloud' into Developer-Branch

Conflicts:
	FrontEnd/Dashboard/Dashboard/Dashboard/Base.lproj/Main.storyboard
edited storyboard

edited storyboard
Merge branch 'Developer-Branch' into create-team-cloud
build error on matts side

committing what I’m working on to merge with matt’s updated build