Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek

# Conflicts:
#	App.js

App.js

@@ -16,6 +16,7 @@ import { Text, View } from 'react-native';
 import { AppLoading } from 'expo';
 import * as Font from 'expo-font';
 
+
 export const lang = i18n.translations = {
   en: en,
   id: id