Rid of template stuff
Added Settings Bundle and Basic Settings
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
broken
Revert cd55523..bffe650

This rolls back to commit cd55523fdc9639633d4e3c40187e67b016b724af.
interface state
Merge branch 'mattUITeamInfo'
interface state
Revert 877e553..dd50473

This rolls back to commit 877e5534fb0264553d681a38e22d374f24b18cb5.
interface state
Revert 63f0b22..f420c55

This rolls back to commit 63f0b2209de9114a4ae08f719d069a8134077428.
Merge branch 'master' into mattUITeamInfo