old_contents: 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;
  
new_contents: 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 logo = require('../images/OneStopShopLogo.png');
  
  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;
  
subject: Update TabNav slightly, commit before merge