switch to tab bar in code
Merge branch 'master' of https://github.com/stonybrooklyn/HungerCinch

Conflicts:
	HungerCinch.xcodeproj/project.pbxproj
fix merge conflict