Merge branch 'master' of ssh://khuhub.khu.ac.kr:12959/2016104130/pocketMovie

+export function getAPI_KEY1() {
+  return "2bf00f660b1a6a3ffeb6e06ac270cce3";
+}
+export function getAPI_KEY2() {
+  return "840724c8aa8b3b7c4ab68db53310cc9f";
+}
+
+export function getNAVER_CLIENT_ID() {
+  return "KqPsntd1hcPJ8FUPBGqN";
+}
+export function getNAVER_CLIENT_SECRET() {
+  return "0GRb3uya1U";
+}

-import React, { Component } from "react";
-import { StyleSheet, Text, View } from "react-native";
 import { createAppContainer } from "react-navigation";
 import { createAppContainer } from "react-navigation";
 import { createStackNavigator } from "react-navigation-stack";
 import { createStackNavigator } from "react-navigation-stack";
 import MainScreen from "./Components/MainScreen";
 import MainScreen from "./Components/MainScreen";
+<<<<<<< HEAD
 import Detail from "./Components/AppTabNavigator/Detail";
 import Detail from "./Components/AppTabNavigator/Detail";
 // import MovieInfo from "./Components/MovieInfo";
 // import MovieInfo from "./Components/MovieInfo";
+=======
+>>>>>>> c69bdbe342b7cc202b50c97e44ec73f6b50e8cf7
 
 
 const AppStackNavigator = createStackNavigator({
 const AppStackNavigator = createStackNavigator({
   Main: {
   Main: {
     screen: MainScreen // MainScreen 컴포넌트를 네비게이터에 등록
     screen: MainScreen // MainScreen 컴포넌트를 네비게이터에 등록
   },
   },
+<<<<<<< HEAD
   Datail: {
   Datail: {
     screen: Detail
     screen: Detail
   }
   }
+=======
+>>>>>>> c69bdbe342b7cc202b50c97e44ec73f6b50e8cf7
 });
 });
 
 
-export default createAppContainer(AppStackNavigator);
+export default createAppContainer(AppStackNavigator);
\ No newline at end of file

 import React, { Component } from "react";
 import React, { Component } from "react";
-import { View, Text, StyleSheet, Button } from "react-native";
+import { View, Text, StyleSheet } from "react-native";
 import { Icon } from "native-base";
 import { Icon } from "native-base";
 import "react-native-gesture-handler";
 import "react-native-gesture-handler";