nothing much
more blank
Rid of template stuff
Added Settings Bundle and Basic Settings
Settings UI
Added Team Info View Controller and UI
Merge branch 'mattUISettingsPage'

Conflicts:
	FitTogether/FitTogether.xcodeproj/project.pbxproj

FitTogether/FitTogether.xcodeproj/project.xcworkspace/xcuserdata/MattSid
es734.xcuserdatad/UserInterfaceState.xcuserstate
Merge branch 'mattUITeamInfo'

Conflicts:
	FitTogether/FitTogether.xcodeproj/project.pbxproj

FitTogether/FitTogether.xcodeproj/project.xcworkspace/xcuserdata/MattSid
es734.xcuserdatad/UserInterfaceState.xcuserstate
merge failed
Revert 877e553..ba97227

This rolls back to commit 877e5534fb0264553d681a38e22d374f24b18cb5.
rid of default controllers
nothing
nothing
broken
Revert 877e553..72b78ae

This rolls back to commit 877e5534fb0264553d681a38e22d374f24b18cb5.
broken
Revert cd55523..bffe650

This rolls back to commit cd55523fdc9639633d4e3c40187e67b016b724af.
interface state
Merge branch 'mattUITeamInfo'
interface state