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
no changes. storyboard version update.
commit to pull
no more ds store
stupid ass DS_store
edited gitignore file
commit to switch branch
deleted dashboard view controller class file
dashboard view is working properly as before
Merge pull request #12 from whoisglover/DashboardFixed

all good here
commit to checkout. reference changes.
minor changes to the view controllers so that they set the nav bar title for their respective views.
settings, create a team, and join a team are all working properly and segued correctly