import React, { Component } from 'react';
import { TabNavigator, TabView } from 'react-navigation';
import Icon from 'react-native-vector-icons/FontAwesome';
import StackNav from './StackNav';
import ShoppingList from '../screens/ShoppingList';

import colors from './colors';

const ICON_SIZE = 25;

const TabNav = TabNavigator({
  StackNav: { screen: StackNav },
  ShoppingList: {
    screen: ShoppingList,
    navigationOptions: {
      tabBarLabel: "Shopping List",
      tabBarIcon: ({ tintColor }) => <Icon
                                      size={ICON_SIZE}
                                      color={colors.icon}
                                      name="shopping-bag"
                                    />
    },
  }
});

export default TabNav;

@@ -292,16 +292,71 @@
 ZE = 25;
+%0Aconst logo = require('../images/OneStopShopLogo.png');
 %0A%0Aconst 

Update TabNav slightly, commit before merge