storyboard upate, no real change
fixing merge conflict in Storyboard.Main (tools version)
Merge branch 'master' of https://github.com/whoisglover/FitTogether

Conflicts:
	FitTogetherOne/FitTogetherOne/Base.lproj/Main.storyboard
Merge branch 'master' into settingViewController