Merge branch 'master' of honey.fitz.guru:eventment-app

# Conflicts:
#	app/actions/profile.js
#	app/router.js

app/router.js

@@ -13,8 +13,8 @@ import ImageDetail from './screens/ImageDetail.js';
 import Item from './screens/Item.js';
 import Marketplace from './screens/Marketplace.js';
 import Profile from './screens/Profile.container.js';
-
-//let screen = Dimensions.get('window');
+import Register from './screens/Register.js';
+import SignInOrRegister from './screens/SignInOrRegister.js';
 
 export const Tabs = createBottomTabNavigator({
   'Event': {
@@ -47,6 +47,25 @@ export const Tabs = createBottomTabNavigator({
   },
 });
 
+export const SignInOrRegisterStack = createStackNavigator({
+  SignInOrRegister: {
+    screen: SignInOrRegister,
+    navigationOptions: ({ navigation }) => {
+      header: null,
+      tabBarVisible: false,
+      gesturesEnabled: false
+    },
+  },
+  Register: {
+    screen: Register,
+    navigationOptions: ({ navigation }) => {
+      header: null,
+      tabBarVisible: false,
+      gesturesEnabled: false
+    },
+  },
+});
+
 export const AuctionStack = createStackNavigator({
   Auction: {
     screen: Auction,