Updated tabbed-nav commit
Implemented tab bar navigation
Updating to allow for merge with tabbed-nav