commit to pull
commit to pull new master
Merge remote-tracking branch 'origin/master'
created settings view controller. added image set for the settings icon nested in the navigation bar. began programmatically adding settings view controller to nav stack upon settings button tap.
tinkered with the setting button and attempted to instantiate a settings view controller and add it to the nav stack. still needs to be completed.
programmatically push the settings view controller to the nav stack when the setting icon is tapped.
no changes
Merge branch 'master' into settingViewController
Merge branch 'master' of https://github.com/whoisglover/FitTogether

Conflicts:
	FitTogetherOne/FitTogetherOne/Base.lproj/Main.storyboard
Merge branch 'master' into settingViewController
Merge pull request #10 from whoisglover/settingViewController

Setting view controller