in the process of converting home screen, settings, and friends view into tab view controller

GetHip.xcodeproj/project.pbxproj

@@ -35,6 +35,7 @@
 		3E3412591C54C6B7006226E0 /* SongCellWrapper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E3412581C54C6B7006226E0 /* SongCellWrapper.swift */; };
 		3E34125B1C54C73A006226E0 /* PartySession.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E34125A1C54C73A006226E0 /* PartySession.swift */; };
 		3E34125D1C54CF1B006226E0 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E34125C1C54CF1B006226E0 /* MediaPlayer.framework */; };
+		3E37709E1CAB5EC000A66097 /* ForgotPassViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3E37709D1CAB5EC000A66097 /* ForgotPassViewController.swift */; };
 		3E379EF61C3E646000F7BCCD /* ParseNetDebug.m in Sources */ = {isa = PBXBuildFile; fileRef = 3E379EF51C3E646000F7BCCD /* ParseNetDebug.m */; };
 		3E379EF71C3F794500F7BCCD /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E76CF2D1C3835C500193B58 /* CFNetwork.framework */; };
 		3E379EFE1C3F794500F7BCCD /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E379EF81C3F794500F7BCCD /* CoreGraphics.framework */; };
@@ -120,13 +121,10 @@
 		3E6D438D1C78969A00CA805F /* CancelInvited@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E6D438C1C78969A00CA805F /* CancelInvited@2x.png */; };
 		3E76CF2C1C38349D00193B58 /* libsqlite3.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3E76CF2B1C38349D00193B58 /* libsqlite3.dylib */; };
 		3E7BB8E21C5B4A350005B834 /* Change Song@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E7BB8E11C5B4A350005B834 /* Change Song@2x.png */; };
-		3E7D37D51C75D7EF002E682F /* Raise@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E7D37D41C75D7EF002E682F /* Raise@2x.png */; };
-		3E7D37D71C75D80F002E682F /* Lower@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E7D37D61C75D80F002E682F /* Lower@2x.png */; };
-		3E7D37D91C75D882002E682F /* B2P Icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E7D37D81C75D882002E682F /* B2P Icon@2x.png */; };
-		3E7D37DB1C75D899002E682F /* B2P Button@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3E7D37DA1C75D899002E682F /* B2P Button@2x.png */; };
 		3EB6B39B1C87B8AE006B674D /* JoiningPartyViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EB6B39A1C87B8AE006B674D /* JoiningPartyViewController.swift */; };
 		3EB8845D1C6C647700CCDCCE /* Add More@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3EB8845B1C6C647700CCDCCE /* Add More@2x.png */; };
 		3EB8845E1C6C647700CCDCCE /* Leave Party@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3EB8845C1C6C647700CCDCCE /* Leave Party@2x.png */; };
+		3EBE825A1CB06793004A2730 /* HomeTabController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3EBE82591CB06793004A2730 /* HomeTabController.swift */; };
 		3EBE97661C53CEDA0079B54A /* Send Invites Button.png in Resources */ = {isa = PBXBuildFile; fileRef = 3EBE97651C53CEDA0079B54A /* Send Invites Button.png */; };
 		3EBE976A1C53E4290079B54A /* Blue Check.png in Resources */ = {isa = PBXBuildFile; fileRef = 3EBE97671C53E4290079B54A /* Blue Check.png */; };
 		3EBE976B1C53E4290079B54A /* cross.png in Resources */ = {isa = PBXBuildFile; fileRef = 3EBE97681C53E4290079B54A /* cross.png */; };
@@ -184,6 +182,7 @@
 		3E3412581C54C6B7006226E0 /* SongCellWrapper.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SongCellWrapper.swift; sourceTree = "<group>"; };
 		3E34125A1C54C73A006226E0 /* PartySession.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PartySession.swift; sourceTree = "<group>"; };
 		3E34125C1C54CF1B006226E0 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
+		3E37709D1CAB5EC000A66097 /* ForgotPassViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForgotPassViewController.swift; sourceTree = "<group>"; };
 		3E379EF51C3E646000F7BCCD /* ParseNetDebug.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ParseNetDebug.m; sourceTree = "<group>"; };
 		3E379EF81C3F794500F7BCCD /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
 		3E379EF91C3F794500F7BCCD /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
@@ -286,13 +285,10 @@
 		3E76CF2D1C3835C500193B58 /* CFNetwork.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CFNetwork.framework; path = System/Library/Frameworks/CFNetwork.framework; sourceTree = SDKROOT; };
 		3E76CF2F1C3835E300193B58 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
 		3E7BB8E11C5B4A350005B834 /* Change Song@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Change Song@2x.png"; path = "../../../Dropbox/Gethip/Screens/Song Selected/5 Song Selected/Assets/Change Song@2x.png"; sourceTree = "<group>"; };
-		3E7D37D41C75D7EF002E682F /* Raise@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Raise@2x.png"; path = "../../../Dropbox/Gethip/For final/Volume/i5 Volume/Raise@2x.png"; sourceTree = "<group>"; };
-		3E7D37D61C75D80F002E682F /* Lower@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Lower@2x.png"; path = "../../../Dropbox/Gethip/For final/Volume/i5 Volume/Lower@2x.png"; sourceTree = "<group>"; };
-		3E7D37D81C75D882002E682F /* B2P Icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "B2P Icon@2x.png"; path = "../../../Dropbox/Gethip/For final/Back To Party/i5/B2P Icon@2x.png"; sourceTree = "<group>"; };
-		3E7D37DA1C75D899002E682F /* B2P Button@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "B2P Button@2x.png"; path = "../../../Dropbox/Gethip/For final/Back To Party/i5/B2P Button@2x.png"; sourceTree = "<group>"; };
 		3EB6B39A1C87B8AE006B674D /* JoiningPartyViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = JoiningPartyViewController.swift; sourceTree = "<group>"; };
 		3EB8845B1C6C647700CCDCCE /* Add More@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Add More@2x.png"; path = "../../../Dropbox/Gethip/Screens/iPhone 5 Party Screens/Party Screen/Assets/Add More@2x.png"; sourceTree = "<group>"; };
 		3EB8845C1C6C647700CCDCCE /* Leave Party@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Leave Party@2x.png"; path = "../../../Dropbox/Gethip/Screens/iPhone 5 Party Screens/Party Screen/Assets/Leave Party@2x.png"; sourceTree = "<group>"; };
+		3EBE82591CB06793004A2730 /* HomeTabController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeTabController.swift; sourceTree = "<group>"; };
 		3EBE97651C53CEDA0079B54A /* Send Invites Button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Send Invites Button.png"; path = "../../../Dropbox/Gethip/Screens/Friends + Invite Screens/i6/Invite Friends/Send Invites Button.png"; sourceTree = "<group>"; };
 		3EBE97671C53E4290079B54A /* Blue Check.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Blue Check.png"; path = "../../../Dropbox/Gethip/Screens/Friends + Invite Screens/i6/Invite Friends/Blue Check.png"; sourceTree = "<group>"; };
 		3EBE97681C53E4290079B54A /* cross.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = cross.png; path = "../../../Dropbox/Gethip/Screens/Friends + Invite Screens/i6/Invite Friends/cross.png"; sourceTree = "<group>"; };
@@ -363,6 +359,7 @@
 				3E18D4921C51F6230012F7DF /* UserParseData.swift */,
 				3E326BCB1C51C20000F785CF /* SettingsTableViewController.swift */,
 				3E1B5E441C5274E700D1AB62 /* SettingsDetailViewWrapper.swift */,
+				3EBE82591CB06793004A2730 /* HomeTabController.swift */,
 			);
 			name = UserSettingsSoruce;
 			sourceTree = "<group>";
@@ -510,10 +507,6 @@
 				3E6D438A1C78968C00CA805F /* Joining@2x.png */,
 				3E6D43851C782E3200CA805F /* Decline@2x.png */,
 				3E4AA5201C853E1A00746839 /* Rectangle 10 + Change Photo + voice_presentation copy + voice_presentation copy 2 + voice_presentation + Music 2 + Music 2@2x.png */,
-				3E7D37DA1C75D899002E682F /* B2P Button@2x.png */,
-				3E7D37D81C75D882002E682F /* B2P Icon@2x.png */,
-				3E7D37D61C75D80F002E682F /* Lower@2x.png */,
-				3E7D37D41C75D7EF002E682F /* Raise@2x.png */,
 				3E0B78B71C6E3756001DF21E /* Pause-52.png */,
 				3E0B78B81C6E3756001DF21E /* Play-52.png */,
 				3EB8845B1C6C647700CCDCCE /* Add More@2x.png */,
@@ -619,6 +612,7 @@
 				3E1BDA561C37111D00EE3B84 /* ViewController.swift */,
 				3E6738F41C6E9C7700B47C3E /* LoginController.swift */,
 				3EF36C751C71694C00CD0DC0 /* SignInController.swift */,
+				3E37709D1CAB5EC000A66097 /* ForgotPassViewController.swift */,
 			);
 			name = "User Authentication";
 			sourceTree = "<group>";
@@ -830,7 +824,6 @@
 			files = (
 				3E5BD3171C6C45CE00266B16 /* StarPlayer@2x.png in Resources */,
 				3E5BD3161C6C45CE00266B16 /* Party@2x.png in Resources */,
-				3E7D37D71C75D80F002E682F /* Lower@2x.png in Resources */,
 				3E4169491C385F1000B193AF /* 1x.png in Resources */,
 				3E4AA5211C853E1A00746839 /* Rectangle 10 + Change Photo + voice_presentation copy + voice_presentation copy 2 + voice_presentation + Music 2 + Music 2@2x.png in Resources */,
 				3E5952641C39DBC900C88C71 /* Friends@2x.png in Resources */,
@@ -852,7 +845,6 @@
 				3E5952811C39DDA800C88C71 /* Settings.png in Resources */,
 				3E59527E1C39DDA800C88C71 /* Group.png in Resources */,
 				3E6D438D1C78969A00CA805F /* CancelInvited@2x.png in Resources */,
-				3E7D37DB1C75D899002E682F /* B2P Button@2x.png in Resources */,
 				3E5952711C39DC1E00C88C71 /* Rectangle 10 + Change Photo + voice_presentation copy + voice_presentation copy 2 + voice_presentation + Music 2 + Music 2@3x.png in Resources */,
 				3E6D438B1C78968C00CA805F /* Joining@2x.png in Resources */,
 				3E33EFDC1C5B56340011B9B5 /* No Friend Requests i5@2x.png in Resources */,
@@ -866,7 +858,6 @@
 				3E59527B1C39DDA800C88C71 /* Create.png in Resources */,
 				3E5952701C39DC1E00C88C71 /* Rectangle 10 + Change Photo + voice_presentation copy + voice_presentation copy 2 + voice_presentation + Music 2 + Music 2@2x.png in Resources */,
 				3EBE976C1C53E4290079B54A /* Tap Circle.png in Resources */,
-				3E7D37D91C75D882002E682F /* B2P Icon@2x.png in Resources */,
 				3E5952671C39DBC900C88C71 /* Settings@2x.png in Resources */,
 				3EBE976A1C53E4290079B54A /* Blue Check.png in Resources */,
 				3E438AE71C5738EF0055C97A /* Friends@2x.png in Resources */,
@@ -880,7 +871,6 @@
 				3E5952691C39DBC900C88C71 /* Star.png in Resources */,
 				3E41D74E1C8D17F300FFD846 /* Icon-60.png in Resources */,
 				3E59527C1C39DDA800C88C71 /* Create@2x.png in Resources */,
-				3E7D37D51C75D7EF002E682F /* Raise@2x.png in Resources */,
 				3E59526A1C39DBC900C88C71 /* Star@2x.png in Resources */,
 				3E5952821C39DDA800C88C71 /* Settings@2x.png in Resources */,
 				3EB8845D1C6C647700CCDCCE /* Add More@2x.png in Resources */,
@@ -913,10 +903,12 @@
 				3E627FE61C55AE35005C0372 /* NSInputStream+URLInitialization.m in Sources */,
 				3E5485B51C69CE2F00E7D5AB /* InvitedCollectionViewCell.swift in Sources */,
 				3E6D43891C7831B100CA805F /* InvitedToPartyViewController.swift in Sources */,
+				3E37709E1CAB5EC000A66097 /* ForgotPassViewController.swift in Sources */,
 				3E3412571C54C31F006226E0 /* SongSelectionViewController.swift in Sources */,
 				3E627FE81C55AE35005C0372 /* TDAudioMetaInfo.m in Sources */,
 				3E6738F51C6E9C7700B47C3E /* LoginController.swift in Sources */,
 				3E34125B1C54C73A006226E0 /* PartySession.swift in Sources */,
+				3EBE825A1CB06793004A2730 /* HomeTabController.swift in Sources */,
 				3E50E0401C74B97300EB9EA9 /* BackToHomeScreenViewController.swift in Sources */,
 				3E627FF01C55AE35005C0372 /* TDAudioStream.m in Sources */,
 				3E627FE91C55AE35005C0372 /* TDAudioPlayer.m in Sources */,

GetHip/AppDelegate.swift

@@ -44,14 +44,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate , CLLocationManagerDelegat
         startSignificantChangeUpdates()
         
         //check if user logged in on app startup
-        if(PFUser.currentUser() != nil){
-            
         var storyboard = UIStoryboard(name: "Main", bundle: nil)
         
-            var initialViewController = storyboard.instantiateViewControllerWithIdentifier("HomeVC") as! HomeScreenViewController
+        if(PFUser.currentUser() == nil){
+            
+            //var initialViewController = storyboard.instantiateViewControllerWithIdentifier("HomeVC") as! HomeScreenViewController
+            var initialViewController = storyboard.instantiateViewControllerWithIdentifier("LoginVC") as! UITabBarController
             self.window?.rootViewController = initialViewController
             self.window?.makeKeyAndVisible()
             
+        }else{
         }
         
         return true

GetHip/ForgotPassViewController.swift

@@ -0,0 +1,35 @@
+//
+//  ForgotPassViewController.swift
+//  GetHip
+//
+//  Created by Okechi on 3/29/16.
+//  Copyright (c) 2016 Kroleo. All rights reserved.
+//
+
+import UIKit
+
+class ForgotPassViewController: UIViewController {
+
+    override func viewDidLoad() {
+        super.viewDidLoad()
+
+        // Do any additional setup after loading the view.
+    }
+
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+
+    /*
+    // MARK: - Navigation
+
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+        // Get the new view controller using segue.destinationViewController.
+        // Pass the selected object to the new view controller.
+    }
+    */
+
+}

GetHip/FriendsListViewController.swift

@@ -38,6 +38,13 @@ class FriendsListViewController: UIViewController, UITableViewDelegate, UITableV
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        //for sharing data with tab bar navigations
+        self.user = (self.tabBarController as? HomeTabController)!.userData
+        self.party = (self.tabBarController as? HomeTabController)!.partyData
+        self.friends = (self.tabBarController as? HomeTabController)!.friendData
+        self.request = (self.tabBarController as? HomeTabController)!.requestData
+        
         self.table.delegate = self
         self.table.dataSource = self
         self.party.delegate = self

GetHip/HomeScreenViewController.swift

@@ -22,6 +22,7 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
     
     
     //async data update methods
+    /*
     func refreshFriendData(notification:NSNotification){
         
         let friendInfo = self.frndDataManager.getFriends()
@@ -43,7 +44,8 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
         
         
     }
-    
+*/
+    /*
     func refreshUserData(notification:NSNotification){
         
         self.userData = self.usrDataManager.getUser()
@@ -66,11 +68,13 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
         
         self.frndDataManager = FriendDataSource()        
     }
+    */
     
+    /*
     func loadID(notification: NSNotification){
         self.performSegueWithIdentifier("InviteFriendsSegue", sender: nil)
     }
-    
+    */
     
     
     override func viewDidLoad() {
@@ -80,19 +84,21 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
         self.view.backgroundColor = UIColor.whiteColor()
         CreateAPartyBtn.layer.cornerRadius = 5
         CreateAPartyBtn.layer.borderWidth = 1
-        self.navigationController?.navigationBarHidden = true
+        //self.tabBarController?.delegate = self
+        //self.navigationController?.navigationBarHidden = true
         
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "loadID:", name: "gotDisplayID", object: nil)
+        //NSNotificationCenter.defaultCenter().addObserver(self, selector: "loadID:", name: "gotDisplayID", object: nil)
         
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshFriendData:", name: "refreshTableView", object: nil)
+        //NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshFriendData:", name: "refreshTableView", object: nil)
         
-        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshUserData:", name: "refreshSettingsView", object: nil)
+        //NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshUserData:", name: "refreshSettingsView", object: nil)
     
         
         
     }
     
     override func viewWillAppear(animated: Bool) {
+        /*
         self.userData = []
         self.friendData = []
         dispatch_async(dispatch_get_main_queue(), {
@@ -100,6 +106,7 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
             //self.frndDataManager = FriendDataSource()
 
         })
+*/
         
     }
 
@@ -133,7 +140,7 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
         if segue.identifier == "FriendListSegue" {
             let nav: UINavigationController = (segue.destinationViewController as? UINavigationController)!
             
-            let vc: FriendsListViewController = (nav.viewControllers[0] as? FriendsListViewController)!
+            let vc: FriendsListViewController = /*segue.destinationViewController as! FriendsListViewController */(nav.viewControllers[0] as? FriendsListViewController)!
             vc.setData(self.friendData, requst: self.requestData, party: self.partyData, user: self.userData)
         }
     }
@@ -149,7 +156,23 @@ class HomeScreenViewController: UIViewController, PartyServiceManagerDelegate {
     */
 
 }
+/*
+extension HomeScreenViewController: UITabBarControllerDelegate {
+    func tabBarController(tabBarController: UITabBarController, didSelectViewController viewController: UIViewController) {
+        if viewController .isKindOfClass(SettingsTableViewController) {
         
+            let vc: SettingsTableViewController = (viewController as? SettingsTableViewController)!
+            vc.setData(self.userData, prty: self.partyData, frends: self.friendData, request: self.requestData)
+            
+        }else if(viewController .isKindOfClass(FriendsListViewController)){
+            
+            let vc: FriendsListViewController = (viewController as? FriendsListViewController)!
+            vc.setData(self.friendData, requst: self.requestData, party: self.partyData, user: self.userData)
+            
+        }
+    }
+}
+*/
 extension HomeScreenViewController: PartyServiceManagerDelegate {
     func foundPeer() {
         if(self.firstTimeBrowsing == true){

GetHip/HomeTabController.swift

@@ -0,0 +1,120 @@
+//
+//  HomeTabController.swift
+//  GetHip
+//
+//  Created by Okechi on 4/2/16.
+//  Copyright (c) 2016 Kroleo. All rights reserved.
+//
+
+import UIKit
+
+class HomeTabController: UITabBarController {
+
+    var usrDataManager: UserParseDataSource!
+    var frndDataManager: FriendDataSource!
+    var friendData: [FriendData] = []
+    var requestData: [FriendData] = []
+    var userData: [UserParseData] = []
+    let partyData = PartyServiceManager()
+    var firstTime: Bool = true
+    private var firstTimeBrowsing: Bool = true
+    //@IBOutlet weak var CreateAPartyBtn: UIButton!
+    
+    
+    //async data update methods
+    func refreshFriendData(notification:NSNotification){
+        
+        let friendInfo = self.frndDataManager.getFriends()
+        
+        for pendingFriend in friendInfo {
+            if pendingFriend.status == "pending"{
+                self.requestData.append(pendingFriend)
+            }else{
+                self.friendData.append(pendingFriend)
+            }
+        }
+        
+        //start browsing for peers
+        self.partyData.setBrowser()
+        self.partyData.startBrowser()
+        
+        //self.partyData.delegate = self
+        self.firstTime = false
+        
+        
+    }
+    
+    func refreshUserData(notification:NSNotification){
+        
+        self.userData = self.usrDataManager.getUser()
+        
+        if(self.firstTime == true){
+            self.partyData.setPeerID((self.userData[0].displayName))
+            self.partyData.initializeSession()
+            
+            //start peer-to-peer advertising
+            self.partyData.setAdvertiser()
+            self.partyData.startListening()
+            
+            //start browsing for peers
+            //self.partyData.setBrowser()
+            //self.partyData.startBrowser()
+            //self.firstTime = false
+        }
+        
+        self.frndDataManager = FriendDataSource()
+    }
+    
+    func loadID(notification: NSNotification){
+        self.performSegueWithIdentifier("InviteFriendsSegue", sender: nil)
+    }
+    
+    
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        
+        // Do any additional setup after loading the view.
+        self.view.backgroundColor = UIColor.whiteColor()
+        //CreateAPartyBtn.layer.cornerRadius = 5
+        //CreateAPartyBtn.layer.borderWidth = 1
+        //self.tabBarController?.delegate = self
+        //self.navigationController?.navigationBarHidden = true
+        
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "loadID:", name: "gotDisplayID", object: nil)
+        
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshFriendData:", name: "refreshTableView", object: nil)
+        
+        NSNotificationCenter.defaultCenter().addObserver(self, selector: "refreshUserData:", name: "refreshSettingsView", object: nil)
+        
+        self.userData = []
+        self.friendData = []
+        dispatch_async(dispatch_get_main_queue(), {
+            self.usrDataManager = UserParseDataSource()
+            //self.frndDataManager = FriendDataSource()
+            
+        })
+    }
+    
+    override func viewWillAppear(animated: Bool) {
+        
+        
+    }
+    
+    override func didReceiveMemoryWarning() {
+        super.didReceiveMemoryWarning()
+        // Dispose of any resources that can be recreated.
+    }
+    
+    /*
+    // MARK: - Navigation
+    
+    // In a storyboard-based application, you will often want to do a little preparation before navigation
+    override func prepareForSegue(segue: UIStoryboardSegue, sender: AnyObject?) {
+    // Get the new view controller using segue.destinationViewController.
+    // Pass the selected object to the new view controller.
+    }
+    */
+    
+}
+

GetHip/Images-3.xcassets/Tab Icons/FriendsTab.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Friends@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Friends@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GetHip/Images-3.xcassets/Tab Icons/PartyTab.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Headphones@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Headphones@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GetHip/Images-3.xcassets/Tab Icons/SettingsTab.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "Settings@2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "Settings@3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

GetHip/Info.plist

@@ -35,7 +35,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>2</string>
+	<string>3</string>
 	<key>FacebookAppID</key>
 	<string>1166375230058840</string>
 	<key>FacebookDisplayName</key>

GetHip/LoginController.swift

@@ -32,10 +32,14 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate, UITextFi
                         PFUser.logInWithUsernameInBackground(object!.objectForKey("username") as! String, password: self.password.text!, block: {
                             (user, error) -> Void in
                             
-                            if(user != nil){
+                            if(user != nil || error == nil){
-                                self.performSegueWithIdentifier("LoginToHomeSegue", sender: self)
+                                //self.performSegueWithIdentifier("LoginToHomeSegue", sender: self)
+                                let storyboard = UIStoryboard(name: "Main", bundle: nil)
+                                let tabBarController = storyboard.instantiateViewControllerWithIdentifier("TabControllerVC") as! UITabBarController
+                                let appDelegate = UIApplication.sharedApplication().delegate as! AppDelegate
+                                appDelegate.window?.rootViewController = tabBarController
                             }else{
-                                var alert = UIAlertController(title: "Invalid Login", message: "Your username/email or password is incorrect!", preferredStyle: .Alert)
+                                var alert = UIAlertController(title: "Invalid Login", message: "Invalid email or password", preferredStyle: .Alert)
                                 alert.addAction(UIAlertAction(title: "OK", style: .Default, handler:{(action: UIAlertAction!) in alert.dismissViewControllerAnimated(true, completion: nil)}))
                                 
                                 self.presentViewController(alert, animated: true, completion: nil)
@@ -44,6 +48,10 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate, UITextFi
                 })
             })
         }else{
+            let alert = UIAlertController(title: "Invalid Login", message: "Invalid email or password", preferredStyle: .Alert)
+            alert.addAction(UIAlertAction(title: "OK", style: .Default, handler:{(action: UIAlertAction!) in alert.dismissViewControllerAnimated(true, completion: nil)}))
+            self.presentViewController(alert, animated: true, completion: nil)
+            /*
             PFUser.logInWithUsernameInBackground(userEmailField.text!, password: password.text!, block: {
                 (user, error) -> Void in
                 
@@ -58,13 +66,13 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate, UITextFi
                         self.presentViewController(alert, animated: true, completion: nil)
                     }
                 }else{
-                    let alert = UIAlertController(title: "Network Error", message: error?.description, preferredStyle: .Alert)
+                    let alert = UIAlertController(title: "Invalid Login", message: "Your username/email or password is incorrect!", preferredStyle: .Alert)
                     alert.addAction(UIAlertAction(title: "OK", style: .Default, handler:{(action: UIAlertAction!) in alert.dismissViewControllerAnimated(true, completion: nil)}))
                     
                     self.presentViewController(alert, animated: true, completion: nil)
                 }
                 
-            })
+            })*/
         }
         
     }
@@ -73,7 +81,9 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate, UITextFi
         self.performSegueWithIdentifier("signUpSegue", sender: self)
     }
     
-
+    @IBAction func forgotPassBtn(sender: UIButton){
+        self.performSegueWithIdentifier("ForgotPassSegue", sender: self)
+    }
     
     override func viewDidLoad() {
         super.viewDidLoad()
@@ -85,6 +95,10 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate, UITextFi
             presentLoggedInAlert()
             
         }*/
+        let tapGesture = UITapGestureRecognizer(target: self, action: Selector("hideKeyboard"))
+        tapGesture.cancelsTouchesInView = true
+        self.view.addGestureRecognizer(tapGesture)
+        
         
         self.userEmailField.delegate = self
         self.password.delegate = self
@@ -97,6 +111,10 @@ class LoginController: UIViewController, PFLogInViewControllerDelegate, UITextFi
         
     }
     
+    func hideKeyboard() {
+        self.view.endEditing(true)
+    }
+
     override func didReceiveMemoryWarning() {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.

GetHip/Main.storyboard

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="j0X-k4-h6H">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="MML-b6-w6u">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
@@ -11,7 +11,7 @@
         <!--Login Controller-->
         <scene sceneID="XkJ-Xw-3em">
             <objects>
-                <viewController id="j0X-k4-h6H" customClass="LoginController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="LoginVC" id="j0X-k4-h6H" customClass="LoginController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="UdF-Q0-IgK"/>
                         <viewControllerLayoutGuide type="bottom" id="YdS-RO-b90"/>
@@ -72,6 +72,9 @@
                                     <color key="titleColor" red="0.99534004239999996" green="0.99264980189999996" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                     <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                 </state>
+                                <connections>
+                                    <action selector="forgotPassBtn:" destination="j0X-k4-h6H" eventType="touchUpInside" id="T7b-ff-OG9"/>
+                                </connections>
                             </button>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="SignInLogo" translatesAutoresizingMaskIntoConstraints="NO" id="T6r-Qq-YOU">
                                 <rect key="frame" x="16" y="28" width="288" height="209"/>
@@ -90,6 +93,7 @@
                         </subviews>
                         <color key="backgroundColor" red="0.0" green="0.67450980392156867" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <color key="tintColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <gestureRecognizers/>
                         <constraints>
                             <constraint firstItem="T6r-Qq-YOU" firstAttribute="leading" secondItem="18p-VZ-rZM" secondAttribute="leadingMargin" id="57d-Wd-JqB"/>
                             <constraint firstItem="now-tn-sIq" firstAttribute="leading" secondItem="18p-VZ-rZM" secondAttribute="leadingMargin" constant="8" id="6Nm-Jz-u88"/>
@@ -110,6 +114,9 @@
                             <constraint firstItem="YdS-RO-b90" firstAttribute="top" secondItem="lST-pS-LgB" secondAttribute="bottom" constant="14" id="xtg-cY-htR"/>
                             <constraint firstItem="gFr-9c-756" firstAttribute="leading" secondItem="18p-VZ-rZM" secondAttribute="leadingMargin" constant="8" id="ylc-hd-inw"/>
                         </constraints>
+                        <connections>
+                            <outletCollection property="gestureRecognizers" destination="6yX-hl-3OA" appends="YES" id="l8b-gg-zje"/>
+                        </connections>
                     </view>
                     <navigationItem key="navigationItem" id="JtB-YG-RXM"/>
                     <nil key="simulatedTopBarMetrics"/>
@@ -120,11 +127,12 @@
                         <outlet property="signIn" destination="ALE-x0-k9I" id="mOR-kB-ZID"/>
                         <outlet property="signUpButton" destination="lST-pS-LgB" id="Foa-6z-LBJ"/>
                         <outlet property="userEmailField" destination="gFr-9c-756" id="xPA-UK-gem"/>
-                        <segue destination="i3K-xv-zw1" kind="presentation" identifier="LoginToHomeSegue" id="5pn-ck-WiI"/>
                         <segue destination="CzG-yI-Fm4" kind="show" identifier="signUpSegue" id="5eZ-Bl-cuD"/>
+                        <segue destination="MML-b6-w6u" kind="show" identifier="LoginToHomeSegue" id="OLY-AZ-xl6"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="6qe-4m-7Cy" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <tapGestureRecognizer id="6yX-hl-3OA"/>
             </objects>
             <point key="canvasLocation" x="-274" y="1026"/>
         </scene>
@@ -140,48 +148,7 @@
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sAc-4h-398">
+                            <button opaque="NO" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8lW-PH-WAb">
-                                <rect key="frame" x="85" y="90" width="150" height="150"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="sAc-4h-398" secondAttribute="height" multiplier="1:1" id="SQw-gH-hIZ"/>
-                                </constraints>
-                            </imageView>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Name" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="t1a-J1-BHH">
-                                <rect key="frame" x="16" y="303" width="288" height="30"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="t1a-J1-BHH" secondAttribute="height" multiplier="32:3" id="0uZ-Nb-Nyu"/>
-                                </constraints>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <textInputTraits key="textInputTraits"/>
-                            </textField>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Email" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="TZI-98-3nh">
-                                <rect key="frame" x="16" y="379" width="288" height="30"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <textInputTraits key="textInputTraits"/>
-                            </textField>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="epf-V1-rcM">
-                                <rect key="frame" x="16" y="417" width="288" height="30"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <textInputTraits key="textInputTraits"/>
-                            </textField>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ify-XA-8uy">
-                                <rect key="frame" x="70" y="248" width="180" height="30"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="Ify-XA-8uy" secondAttribute="height" multiplier="6:1" id="1SL-2w-vwy"/>
-                                    <constraint firstAttribute="width" secondItem="Ify-XA-8uy" secondAttribute="height" multiplier="6:1" id="9xr-HK-zfN"/>
-                                </constraints>
-                                <state key="normal" title="Change Photo">
-                                    <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="chngePhoto:" destination="dsv-bM-qgc" eventType="touchUpInside" id="YSc-B1-dfo"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8lW-PH-WAb">
                                 <rect key="frame" x="0.0" y="533" width="320" height="35"/>
                                 <color key="backgroundColor" red="0.097259112270000003" green="0.60830058499999995" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
@@ -194,6 +161,35 @@
                                     <action selector="saveNewProfile:" destination="dsv-bM-qgc" eventType="touchUpInside" id="NQ8-4Y-OtT"/>
                                 </connections>
                             </button>
+                            <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" ambiguous="YES" misplaced="YES" bounces="NO" translatesAutoresizingMaskIntoConstraints="NO" id="B5E-KO-Yxe">
+                                <rect key="frame" x="0.0" y="64" width="320" height="533"/>
+                                <subviews>
+                                    <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ify-XA-8uy">
+                                        <rect key="frame" x="70" y="248" width="180" height="30"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" secondItem="Ify-XA-8uy" secondAttribute="height" multiplier="6:1" id="1SL-2w-vwy"/>
+                                            <constraint firstAttribute="width" secondItem="Ify-XA-8uy" secondAttribute="height" multiplier="6:1" id="9xr-HK-zfN"/>
+                                        </constraints>
+                                        <state key="normal" title="Choose Photo">
+                                            <color key="titleColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                            <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="chngePhoto:" destination="dsv-bM-qgc" eventType="touchUpInside" id="YSc-B1-dfo"/>
+                                        </connections>
+                                    </button>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="epf-V1-rcM">
+                                        <rect key="frame" x="16" y="417" width="288" height="30"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Email" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="TZI-98-3nh">
+                                        <rect key="frame" x="16" y="379" width="288" height="30"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
                                     <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Username" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="wbB-YU-CFd">
                                         <rect key="frame" x="16" y="341" width="288" height="30"/>
                                         <constraints>
@@ -203,31 +199,60 @@
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <textInputTraits key="textInputTraits"/>
                                     </textField>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Name" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="t1a-J1-BHH">
+                                        <rect key="frame" x="16" y="303" width="288" height="30"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" secondItem="t1a-J1-BHH" secondAttribute="height" multiplier="32:3" id="0uZ-Nb-Nyu"/>
+                                        </constraints>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <textInputTraits key="textInputTraits"/>
+                                    </textField>
+                                    <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="sAc-4h-398">
+                                        <rect key="frame" x="85" y="90" width="150" height="150"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" secondItem="sAc-4h-398" secondAttribute="height" multiplier="1:1" id="SQw-gH-hIZ"/>
+                                        </constraints>
+                                    </imageView>
+                                </subviews>
+                                <constraints>
+                                    <constraint firstItem="epf-V1-rcM" firstAttribute="top" secondItem="TZI-98-3nh" secondAttribute="bottom" constant="8" symbolic="YES" id="5RJ-dV-boL"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="centerX" secondItem="Ify-XA-8uy" secondAttribute="centerX" id="EK4-t8-jCX"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="centerX" secondItem="B5E-KO-Yxe" secondAttribute="centerX" id="LdE-up-ylo"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="leading" secondItem="B5E-KO-Yxe" secondAttribute="leading" constant="16" id="Lii-LT-TJq"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="leading" secondItem="epf-V1-rcM" secondAttribute="leading" id="QRl-lO-pO6"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="trailing" secondItem="t1a-J1-BHH" secondAttribute="trailing" id="T2J-Ng-o0i"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="trailing" secondItem="TZI-98-3nh" secondAttribute="trailing" id="f06-W4-muf"/>
+                                    <constraint firstItem="Ify-XA-8uy" firstAttribute="top" secondItem="sAc-4h-398" secondAttribute="bottom" constant="8" symbolic="YES" id="haj-F9-T5W"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="trailing" secondItem="epf-V1-rcM" secondAttribute="trailing" id="ibk-tH-GfB"/>
+                                    <constraint firstAttribute="bottom" secondItem="wbB-YU-CFd" secondAttribute="bottom" constant="133" id="iti-Rp-9Q2"/>
+                                    <constraint firstItem="TZI-98-3nh" firstAttribute="top" secondItem="wbB-YU-CFd" secondAttribute="bottom" constant="8" symbolic="YES" id="kfy-2D-xV8"/>
+                                    <constraint firstItem="sAc-4h-398" firstAttribute="leading" secondItem="B5E-KO-Yxe" secondAttribute="leading" constant="85" id="mjn-BE-a4S"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="leading" secondItem="TZI-98-3nh" secondAttribute="leading" id="naG-L3-oth"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="top" secondItem="t1a-J1-BHH" secondAttribute="bottom" constant="8" symbolic="YES" id="pEv-lF-0al"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="centerX" secondItem="sAc-4h-398" secondAttribute="centerX" id="rJv-zc-oX5"/>
+                                    <constraint firstItem="wbB-YU-CFd" firstAttribute="top" secondItem="B5E-KO-Yxe" secondAttribute="top" constant="341" id="sHO-ag-bTv"/>
+                                    <constraint firstItem="sAc-4h-398" firstAttribute="top" secondItem="B5E-KO-Yxe" secondAttribute="top" constant="90" id="tSU-om-RR7"/>
+                                    <constraint firstItem="epf-V1-rcM" firstAttribute="leading" secondItem="t1a-J1-BHH" secondAttribute="leading" id="utR-jT-sgQ"/>
+                                </constraints>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="size" keyPath="contentSize">
+                                        <size key="value" width="320" height="504"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </scrollView>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        <gestureRecognizers/>
                         <constraints>
-                            <constraint firstItem="Ify-XA-8uy" firstAttribute="top" secondItem="sAc-4h-398" secondAttribute="bottom" constant="8" id="5nU-TP-Qhl"/>
+                            <constraint firstAttribute="trailing" secondItem="B5E-KO-Yxe" secondAttribute="trailing" id="QQH-87-7SW"/>
-                            <constraint firstItem="d3F-vg-2MJ" firstAttribute="top" secondItem="8lW-PH-WAb" secondAttribute="bottom" id="9Zv-br-Rps"/>
+                            <constraint firstItem="B5E-KO-Yxe" firstAttribute="leading" secondItem="ZUX-lP-V5A" secondAttribute="leading" id="dfk-eg-tLF"/>
-                            <constraint firstItem="Ify-XA-8uy" firstAttribute="leading" secondItem="ZUX-lP-V5A" secondAttribute="leadingMargin" constant="54" id="EAH-xE-w74"/>
+                            <constraint firstItem="B5E-KO-Yxe" firstAttribute="top" secondItem="BqE-PA-y7k" secondAttribute="bottom" id="ghm-79-99I"/>
-                            <constraint firstItem="t1a-J1-BHH" firstAttribute="top" secondItem="Ify-XA-8uy" secondAttribute="bottom" constant="25" id="GUJ-SC-SaT"/>
+                            <constraint firstItem="d3F-vg-2MJ" firstAttribute="top" secondItem="B5E-KO-Yxe" secondAttribute="bottom" id="roc-Zy-auE"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="sAc-4h-398" secondAttribute="trailing" constant="69" id="IaY-ib-vxc"/>
-                            <constraint firstItem="wbB-YU-CFd" firstAttribute="top" secondItem="t1a-J1-BHH" secondAttribute="bottom" constant="8" symbolic="YES" id="Ijn-q0-ZfC"/>
-                            <constraint firstItem="TZI-98-3nh" firstAttribute="leading" secondItem="wbB-YU-CFd" secondAttribute="leading" id="Lh7-l3-TJk"/>
-                            <constraint firstItem="t1a-J1-BHH" firstAttribute="centerX" secondItem="Ify-XA-8uy" secondAttribute="centerX" id="NkF-XG-Jpg"/>
-                            <constraint firstItem="TZI-98-3nh" firstAttribute="leading" secondItem="ZUX-lP-V5A" secondAttribute="leadingMargin" id="Rad-R1-NG1"/>
-                            <constraint firstItem="wbB-YU-CFd" firstAttribute="trailing" secondItem="TZI-98-3nh" secondAttribute="trailing" id="SXl-ML-wUU"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="Ify-XA-8uy" secondAttribute="trailing" constant="54" id="ULs-LR-VBj"/>
-                            <constraint firstItem="8lW-PH-WAb" firstAttribute="leading" secondItem="ZUX-lP-V5A" secondAttribute="leadingMargin" constant="-16" id="UfV-fL-3tD"/>
-                            <constraint firstItem="TZI-98-3nh" firstAttribute="trailing" secondItem="epf-V1-rcM" secondAttribute="trailing" id="V4a-z7-37D"/>
-                            <constraint firstItem="sAc-4h-398" firstAttribute="top" secondItem="BqE-PA-y7k" secondAttribute="bottom" constant="26" id="aDf-o2-mwo"/>
-                            <constraint firstItem="TZI-98-3nh" firstAttribute="leading" secondItem="epf-V1-rcM" secondAttribute="leading" id="c3x-1N-NnF"/>
-                            <constraint firstItem="sAc-4h-398" firstAttribute="leading" secondItem="ZUX-lP-V5A" secondAttribute="leadingMargin" constant="69" id="mk8-mI-8Um"/>
-                            <constraint firstItem="wbB-YU-CFd" firstAttribute="leading" secondItem="t1a-J1-BHH" secondAttribute="leading" id="pch-k9-RBZ"/>
-                            <constraint firstItem="epf-V1-rcM" firstAttribute="top" secondItem="TZI-98-3nh" secondAttribute="bottom" constant="8" symbolic="YES" id="scz-NT-5W8"/>
-                            <constraint firstItem="TZI-98-3nh" firstAttribute="top" secondItem="wbB-YU-CFd" secondAttribute="bottom" constant="8" symbolic="YES" id="tfC-Sv-qwb"/>
-                            <constraint firstAttribute="trailingMargin" secondItem="8lW-PH-WAb" secondAttribute="trailing" constant="-16" id="u3D-81-Ihy"/>
-                            <constraint firstItem="t1a-J1-BHH" firstAttribute="trailing" secondItem="wbB-YU-CFd" secondAttribute="trailing" id="zb1-67-RFF"/>
                         </constraints>
+                        <connections>
+                            <outletCollection property="gestureRecognizers" destination="0VU-GN-qwl" appends="YES" id="qN1-h9-hBV"/>
+                        </connections>
                     </view>
                     <navigationItem key="navigationItem" title="Account Creation" id="wal-Nl-HBB">
                         <barButtonItem key="leftBarButtonItem" title="Cancel" id="bK9-iV-F0i">
@@ -237,7 +262,8 @@
                         </barButtonItem>
                     </navigationItem>
                     <simulatedNavigationBarMetrics key="simulatedTopBarMetrics" prompted="NO"/>
-                    <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
+                    <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
+                    <size key="freeformSize" width="320" height="568"/>
                     <connections>
                         <outlet property="chngPhotoBtn" destination="Ify-XA-8uy" id="wSI-a9-Mhf"/>
                         <outlet property="emailField" destination="TZI-98-3nh" id="63f-tp-CBg"/>
@@ -245,11 +271,13 @@
                         <outlet property="passField" destination="epf-V1-rcM" id="KbC-NJ-GEZ"/>
                         <outlet property="profilePic" destination="sAc-4h-398" id="rlt-kj-GBV"/>
                         <outlet property="saveBtn" destination="8lW-PH-WAb" id="7lt-lh-9gs"/>
+                        <outlet property="scrollView" destination="B5E-KO-Yxe" id="Z6y-0w-ugI"/>
                         <outlet property="userField" destination="wbB-YU-CFd" id="rQn-dc-zWM"/>
                         <segue destination="i3K-xv-zw1" kind="modal" identifier="SignedUpSegue" id="4Cw-Wg-nXy"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="L2S-Q5-7iA" userLabel="First Responder" sceneMemberID="firstResponder"/>
+                <tapGestureRecognizer id="0VU-GN-qwl"/>
             </objects>
             <point key="canvasLocation" x="671" y="1027"/>
         </scene>
@@ -293,7 +321,7 @@
                                     <constraint firstAttribute="width" secondItem="oG8-pz-CA3" secondAttribute="height" multiplier="39:7" id="jpB-3t-8zk"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="30" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FFv-lp-b7d">
@@ -302,7 +330,7 @@
                                     <constraint firstAttribute="width" secondItem="FFv-lp-b7d" secondAttribute="height" multiplier="2:1" id="6h6-90-4nk"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="u1Z-Ju-AJf">
@@ -501,17 +529,17 @@
                         <viewControllerLayoutGuide type="bottom" id="TbO-r5-p5C"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="7j0-GI-WEY">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="dcC-PI-dUM">
+                            <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dcC-PI-dUM">
                                 <rect key="frame" x="92" y="172" width="137" height="137"/>
                                 <color key="backgroundColor" red="0.47790404040000001" green="0.47790404040000001" blue="0.47790404040000001" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="dcC-PI-dUM" secondAttribute="height" multiplier="1:1" id="k78-9a-PzH"/>
                                 </constraints>
                             </imageView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="No Friend Found :(" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxx-ws-paN">
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="No Friend Found :(" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wxx-ws-paN">
                                 <rect key="frame" x="16" y="143" width="288" height="21"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="wxx-ws-paN" secondAttribute="height" multiplier="96:7" id="01G-k4-5I5"/>
@@ -520,7 +548,7 @@
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Search for a new Friend" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="EAo-0U-cmz">
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Search for a new Friend" textAlignment="center" minimumFontSize="17" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="EAo-0U-cmz">
                                 <rect key="frame" x="0.0" y="64" width="320" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="EAo-0U-cmz" secondAttribute="height" multiplier="32:3" id="9iE-5D-OrP"/>
@@ -531,7 +559,7 @@
                                     <action selector="buttonClicked:" destination="Iog-DT-pLJ" eventType="editingDidEnd" id="Xrc-To-w28"/>
                                 </connections>
                             </textField>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gck-Ni-mM6">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Gck-Ni-mM6">
                                 <rect key="frame" x="61" y="324" width="198" height="41"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Gck-Ni-mM6" secondAttribute="height" multiplier="198:41" id="MBZ-mJ-aEE"/>
@@ -577,7 +605,7 @@
             <objects>
                 <tableViewController title="Friend Requests" id="Rnb-lz-mp4" customClass="PendingRequestViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" id="6eb-it-ynj">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <prototypes>
@@ -672,11 +700,11 @@
                         <viewControllerLayoutGuide type="bottom" id="qXi-L8-LDL"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="XPu-Tq-bas">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="NoNewFriends" translatesAutoresizingMaskIntoConstraints="NO" id="W0g-0K-j03">
-                                <rect key="frame" x="0.0" y="20" width="320" height="548"/>
+                                <rect key="frame" x="0.0" y="20" width="291" height="499"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="W0g-0K-j03" secondAttribute="height" multiplier="80:137" id="q9x-EZ-Z0h"/>
                                 </constraints>
@@ -707,26 +735,46 @@
                     </navigationBar>
                     <connections>
                         <segue destination="dsv-bM-qgc" kind="relationship" relationship="rootViewController" id="NSw-6O-EkM"/>
+                        <segue destination="8Od-AM-nj1" kind="presentation" identifier="ForgotPassSegue" id="soS-fw-yyJ"/>
                     </connections>
                 </navigationController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="mbC-CF-JRB" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
             <point key="canvasLocation" x="205" y="1027"/>
         </scene>
-        <!--Friends List View Controller-->
+        <!--Forgot Pass View Controller-->
+        <scene sceneID="0H6-d7-0mA">
+            <objects>
+                <viewController id="8Od-AM-nj1" customClass="ForgotPassViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="aNc-Qk-q74"/>
+                        <viewControllerLayoutGuide type="bottom" id="cR0-HR-c4n"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="67T-1a-Dhx">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="HT6-Cr-HH3" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="205" y="1837"/>
+        </scene>
+        <!--Friends-->
         <scene sceneID="f64-9e-nxp">
             <objects>
-                <viewController automaticallyAdjustsScrollViewInsets="NO" id="Wv2-hP-rqT" customClass="FriendsListViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="Friends" automaticallyAdjustsScrollViewInsets="NO" id="Wv2-hP-rqT" customClass="FriendsListViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="8ym-uq-Pb7"/>
                         <viewControllerLayoutGuide type="bottom" id="cK5-oC-1To"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="jS0-Hf-zMc">
-                        <rect key="frame" x="0.0" y="64" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="Bxz-d2-wT5">
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="Bxz-d2-wT5">
-                                <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                                <rect key="frame" x="0.0" y="64" width="320" height="455"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Bxz-d2-wT5" secondAttribute="height" multiplier="40:63" id="Hx3-rK-Lha"/>
@@ -801,6 +849,7 @@
                             <constraint firstItem="cK5-oC-1To" firstAttribute="top" secondItem="Bxz-d2-wT5" secondAttribute="bottom" id="v4P-io-2Ul"/>
                         </constraints>
                     </view>
+                    <tabBarItem key="tabBarItem" title="Friends" image="FriendsTab" id="a0b-Vf-ZtP"/>
                     <navigationItem key="navigationItem" id="50c-DG-Vcp">
                         <barButtonItem key="leftBarButtonItem" systemItem="stop" id="v0H-Uq-d6F">
                             <connections>
@@ -853,16 +902,16 @@
             </objects>
             <point key="canvasLocation" x="905" y="-577"/>
         </scene>
-        <!--Home Screen View Controller-->
+        <!--HomeScreen-->
         <scene sceneID="74v-iN-Rpu">
             <objects>
-                <viewController storyboardIdentifier="HomeVC" id="i3K-xv-zw1" customClass="HomeScreenViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="HomeVC" title="HomeScreen" id="i3K-xv-zw1" customClass="HomeScreenViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="TfY-s2-B0B"/>
                         <viewControllerLayoutGuide type="bottom" id="nqn-B0-8f9"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="TKW-IF-c3d">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="HomeScreenTurnTable" translatesAutoresizingMaskIntoConstraints="NO" id="Ugh-Mp-5Vj">
@@ -883,15 +932,6 @@
                                     <segue destination="0Tt-tN-iza" kind="show" identifier="SettingsSegue" id="bZG-mB-VR5"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yyg-Ne-RP5" userLabel="Favorites">
-                                <rect key="frame" x="21" y="483" width="44" height="44"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="yyg-Ne-RP5" secondAttribute="height" multiplier="1:1" id="9fi-bZ-jOZ"/>
-                                </constraints>
-                                <state key="normal" image="HomeScreenStar">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                            </button>
                             <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="NHH-gh-nMz" userLabel="Friends">
                                 <rect key="frame" x="16" y="44" width="55" height="34"/>
                                 <constraints>
@@ -916,6 +956,15 @@
                                     <segue destination="nc9-lY-juO" kind="show" identifier="InviteFriendsSegue" id="pD0-68-oX6"/>
                                 </connections>
                             </button>
+                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yyg-Ne-RP5" userLabel="Favorites">
+                                <rect key="frame" x="21" y="483" width="44" height="44"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="yyg-Ne-RP5" secondAttribute="height" multiplier="1:1" id="9fi-bZ-jOZ"/>
+                                </constraints>
+                                <state key="normal" image="HomeScreenStar">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
@@ -933,6 +982,7 @@
                             <constraint firstAttribute="trailingMargin" secondItem="Ugh-Mp-5Vj" secondAttribute="trailing" constant="88" id="ZLM-G7-oYE"/>
                         </constraints>
                     </view>
+                    <tabBarItem key="tabBarItem" title="Party" image="PartyTab" id="ATa-BO-Uu6"/>
                     <navigationItem key="navigationItem" id="B4L-4B-4wh"/>
                     <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
                     <connections>
@@ -943,6 +993,28 @@
             </objects>
             <point key="canvasLocation" x="1409" y="-630"/>
         </scene>
+        <!--Home Tab Controller-->
+        <scene sceneID="7GB-sn-Y1J">
+            <objects>
+                <tabBarController storyboardIdentifier="TabControlVC" id="MML-b6-w6u" customClass="HomeTabController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
+                    <nil key="simulatedBottomBarMetrics"/>
+                    <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
+                    <tabBar key="tabBar" contentMode="scaleToFill" translucent="NO" id="plX-Xd-QGL">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="49"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                        <color key="selectedImageTintColor" red="0.097259112270000003" green="0.60830058499999995" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                    </tabBar>
+                    <connections>
+                        <segue destination="i3K-xv-zw1" kind="relationship" relationship="viewControllers" id="l8m-mT-D5A"/>
+                        <segue destination="hze-Wf-sBw" kind="relationship" relationship="viewControllers" id="3L5-IY-qPK"/>
+                        <segue destination="Wv2-hP-rqT" kind="relationship" relationship="viewControllers" id="Nib-og-UXO"/>
+                    </connections>
+                </tabBarController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="PNG-em-KUO" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="508" y="-2055"/>
+        </scene>
         <!--Navigation Controller-->
         <scene sceneID="tiH-l9-ICs">
             <objects>
@@ -960,7 +1032,7 @@
             </objects>
             <point key="canvasLocation" x="1868" y="-1281"/>
         </scene>
-        <!--Settings Table View Controller-->
+        <!--Settings-->
         <scene sceneID="DdO-46-Oce">
             <objects>
                 <viewController id="hze-Wf-sBw" customClass="SettingsTableViewController" customModule="GetHip" customModuleProvider="target" sceneMemberID="viewController">
@@ -969,11 +1041,11 @@
                         <viewControllerLayoutGuide type="bottom" id="y0v-Q6-Get"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="ctw-5J-FC7">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Y2n-eR-fV3">
-                                <rect key="frame" x="0.0" y="534" width="320" height="34"/>
+                                <rect key="frame" x="0.0" y="485" width="320" height="34"/>
                                 <color key="backgroundColor" red="1" green="0.18659413420000001" blue="0.1031019395" alpha="1" colorSpace="calibratedRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Y2n-eR-fV3" secondAttribute="height" multiplier="160:17" id="BDj-PP-k5v"/>
@@ -987,7 +1059,7 @@
                                 </connections>
                             </button>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="Fdh-6Y-dZF">
-                                <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                                <rect key="frame" x="0.0" y="72" width="320" height="455"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Fdh-6Y-dZF" secondAttribute="height" multiplier="40:63" id="URn-fa-DeA"/>
@@ -1111,6 +1183,7 @@
                             <constraint firstItem="Fdh-6Y-dZF" firstAttribute="top" secondItem="0iX-Pt-wMZ" secondAttribute="bottom" id="tXV-Xq-Mz6"/>
                         </constraints>
                     </view>
+                    <tabBarItem key="tabBarItem" title="Settings" image="SettingsTab" id="ZMs-Ms-e66"/>
                     <navigationItem key="navigationItem" id="nFi-x9-pS7">
                         <barButtonItem key="leftBarButtonItem" title="Close" id="1Yq-1w-uRp">
                             <connections>
@@ -1132,10 +1205,11 @@
             </objects>
             <point key="canvasLocation" x="2346" y="-1281"/>
         </scene>
-        <!--Navigation Controller-->
+        <!--Item-->
         <scene sceneID="IFn-9L-oom">
             <objects>
                 <navigationController id="nc9-lY-juO" sceneMemberID="viewController">
+                    <tabBarItem key="tabBarItem" title="Item" id="wYr-Wm-0Cv"/>
                     <simulatedScreenMetrics key="simulatedDestinationMetrics" type="retina4"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="Isl-i7-6x2">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
@@ -1158,17 +1232,29 @@
                         <viewControllerLayoutGuide type="bottom" id="l3V-w7-kEv"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Jzb-Yh-jPx">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="n64-qL-raO">
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I0x-SG-Vbs">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                                <rect key="frame" x="0.0" y="479" width="320" height="40"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" secondItem="I0x-SG-Vbs" secondAttribute="height" multiplier="8:1" id="D3B-IT-RFg"/>
+                                </constraints>
+                                <state key="normal" backgroundImage="SendInvitesButton">
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                                <connections>
+                                    <action selector="sendInvites:" destination="ujk-l5-hlK" eventType="touchUpInside" id="Kzv-L7-FD3"/>
+                                </connections>
+                            </button>
+                            <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="n64-qL-raO">
+                                <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="n64-qL-raO" secondAttribute="height" multiplier="40:71" id="4zb-FR-IKu"/>
                                 </constraints>
                                 <searchBar key="tableHeaderView" contentMode="redraw" id="fQ0-dw-Xa4">
-                                    <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                                    <rect key="frame" x="0.0" y="64" width="320" height="44"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                     <textInputTraits key="textInputTraits"/>
                                     <connections>
@@ -1176,7 +1262,7 @@
                                     </connections>
                                 </searchBar>
                                 <prototypes>
-                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TestInviteCell" rowHeight="64" id="Fh8-OZ-AqN" customClass="TestInviteFriendsCell" customModule="GetHip" customModuleProvider="target">
+                                    <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="TestInviteCell" rowHeight="71" id="Fh8-OZ-AqN" customClass="TestInviteFriendsCell" customModule="GetHip" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Fh8-OZ-AqN" id="uSi-Wb-bLf">
@@ -1191,14 +1277,14 @@
                                                         <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                                     </state>
                                                 </button>
-                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="4k6-G5-geO">
+                                                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="4k6-G5-geO">
                                                     <rect key="frame" x="14" y="7" width="50" height="50"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" secondItem="4k6-G5-geO" secondAttribute="height" multiplier="1:1" id="E0D-2H-PEf"/>
                                                     </constraints>
                                                 </imageView>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Friend" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xqN-Id-qka">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Friend" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="xqN-Id-qka">
-                                                    <rect key="frame" x="72" y="21" width="127" height="21"/>
+                                                    <rect key="frame" x="72" y="21" width="142" height="21"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" secondItem="xqN-Id-qka" secondAttribute="height" multiplier="127:21" id="hiC-V4-Frn"/>
                                                     </constraints>
@@ -1226,18 +1312,6 @@
                                     </tableViewCell>
                                 </prototypes>
                             </tableView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="I0x-SG-Vbs">
-                                <rect key="frame" x="0.0" y="528" width="320" height="40"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" secondItem="I0x-SG-Vbs" secondAttribute="height" multiplier="8:1" id="D3B-IT-RFg"/>
-                                </constraints>
-                                <state key="normal" backgroundImage="SendInvitesButton">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="sendInvites:" destination="ujk-l5-hlK" eventType="touchUpInside" id="Kzv-L7-FD3"/>
-                                </connections>
-                            </button>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
@@ -1738,18 +1812,6 @@
                                 </attributedString>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Artist - Album" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VtF-OO-Edp">
-                                <rect key="frame" x="13" y="442" width="294" height="21"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" minimumValueImage="Lower.png" maximumValueImage="Raise.png" translatesAutoresizingMaskIntoConstraints="NO" id="AA9-Xx-q9o">
-                                <rect key="frame" x="26" y="465" width="268" height="31"/>
-                                <connections>
-                                    <action selector="volChng:" destination="5Fd-vs-lX1" eventType="valueChanged" id="hT1-f1-qOr"/>
-                                </connections>
-                            </slider>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="sFb-YR-QlX">
                                 <rect key="frame" x="138" y="505" width="44" height="43"/>
                                 <constraints>
@@ -1772,6 +1834,18 @@
                                     <segue destination="enX-CI-fki" kind="show" identifier="InPartySegue" id="OD2-Xh-xf2"/>
                                 </connections>
                             </button>
+                            <slider opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="0.5" minValue="0.0" maxValue="1" translatesAutoresizingMaskIntoConstraints="NO" id="AA9-Xx-q9o">
+                                <rect key="frame" x="26" y="467" width="268" height="31"/>
+                                <connections>
+                                    <action selector="volChng:" destination="5Fd-vs-lX1" eventType="valueChanged" id="hT1-f1-qOr"/>
+                                </connections>
+                            </slider>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Artist - Album" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="VtF-OO-Edp">
+                                <rect key="frame" x="13" y="442" width="294" height="21"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                         <constraints>
@@ -1832,11 +1906,11 @@
                         <viewControllerLayoutGuide type="bottom" id="Zss-AJ-MHl"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="gPw-6a-U7E">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" misplaced="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="iAI-5U-c8e">
-                                <rect key="frame" x="0.0" y="64" width="320" height="504"/>
+                                <rect key="frame" x="0.0" y="64" width="320" height="455"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="iAI-5U-c8e" secondAttribute="height" multiplier="40:63" id="Ux3-OS-MI8"/>
@@ -1978,7 +2052,7 @@
                         <viewControllerLayoutGuide type="bottom" id="pFl-GS-eCQ"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="KfJ-hO-Coi">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DUZ-CH-9De">
@@ -2052,7 +2126,7 @@
                         <viewControllerLayoutGuide type="bottom" id="xK7-iE-TXj"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="yqM-qv-Rad">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" usesAttributedText="YES" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kND-vl-jfb">
@@ -2127,7 +2201,7 @@
                         <viewControllerLayoutGuide type="bottom" id="mWP-vZ-sRS"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="ptI-d3-Ike">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="519"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VRa-oD-Myj">
@@ -2166,29 +2240,32 @@
         <image name="ChangeSong" width="198" height="32"/>
         <image name="CheckMark" width="38" height="38"/>
         <image name="FriendsIcon" width="66" height="38"/>
+        <image name="FriendsTab" width="49" height="28"/>
         <image name="HomeButton" width="40" height="41"/>
         <image name="HomeScreenCreate" width="173" height="34"/>
         <image name="HomeScreenStar" width="57" height="55"/>
         <image name="HomeScreenTurnTable" width="133" height="133"/>
         <image name="JoingAParty" width="201" height="142"/>
-        <image name="Lower.png" width="7" height="10"/>
         <image name="NoNewFriends" width="414" height="736"/>
         <image name="Party.png" width="81" height="41"/>
+        <image name="PartyTab" width="35" height="30"/>
         <image name="PauseButton" width="26" height="26"/>
-        <image name="Raise.png" width="14" height="13"/>
         <image name="Rectangle 10 + Change Photo + voice_presentation copy + voice_presentation copy 2 + voice_presentation + Music 2 + Music 2.png" width="203" height="153"/>
         <image name="SendFriendRequest" width="198" height="32"/>
         <image name="SendInvitesButton" width="414" height="52"/>
         <image name="SendInvitesTapCircle" width="31" height="30"/>
         <image name="SettingsIcon" width="41" height="40"/>
+        <image name="SettingsTab" width="31" height="31"/>
         <image name="SignInLogo" width="332" height="242"/>
         <image name="XMark" width="38" height="38"/>
     </resources>
     <inferredMetricsTieBreakers>
-        <segue reference="wiM-xb-lpR"/>
+        <segue reference="3Qh-V2-6Ee"/>
-        <segue reference="saO-e1-UsU"/>
+        <segue reference="l8m-mT-D5A"/>
-        <segue reference="45l-um-hHv"/>
+        <segue reference="3L5-IY-qPK"/>
-        <segue reference="WxI-P3-JZ9"/>
+        <segue reference="Nib-og-UXO"/>
-        <segue reference="5pn-ck-WiI"/>
+        <segue reference="bZG-mB-VR5"/>
+        <segue reference="hjX-RT-64R"/>
+        <segue reference="Imp-mG-tFc"/>
     </inferredMetricsTieBreakers>
 </document>

GetHip/SettingsTableViewController.swift

@@ -50,6 +50,13 @@ class SettingsTableViewController: UIViewController, UITableViewDataSource, UITa
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        //for sharing data with tab bar navigations
+        self.user = (self.tabBarController as? HomeTabController)!.userData
+        self.party = (self.tabBarController as? HomeTabController)!.partyData
+        self.friendData = (self.tabBarController as? HomeTabController)!.friendData
+        self.requestData = (self.tabBarController as? HomeTabController)!.requestData
+        
         self.title = "Settings"
         
         self.logOutBtn.layer.borderWidth = 1
@@ -295,6 +302,23 @@ class SettingsTableViewController: UIViewController, UITableViewDataSource, UITa
 
 }
 
+extension SettingsTableViewController: UITabBarControllerDelegate {
+    func tabBarController(tabBarController: UITabBarController, didSelectViewController viewController: UIViewController) {
+        if viewController .isKindOfClass(SettingsTableViewController) {
+            
+            let vc: SettingsTableViewController = (viewController as? SettingsTableViewController)!
+            vc.setData(self.user as! [UserParseData], prty: self.party, frends: self.friendData, request: self.requestData)
+            
+        }else if(viewController .isKindOfClass(FriendsListViewController)){
+            
+            let vc: FriendsListViewController = (viewController as? FriendsListViewController)!
+            vc.setData(self.friendData, requst: self.requestData, party: self.party, user: self.user as! [UserParseData])
+            
+        }
+    }
+}
+
+
 extension SettingsTableViewController: PartyServiceManagerDelegate {
     func foundPeer() {
         

GetHip/SignInController.swift

@@ -8,7 +8,7 @@
 
 import UIKit
 
-class SignInController: UIViewController, UINavigationControllerDelegate, UIImagePickerControllerDelegate {
+class SignInController: UIViewController, UINavigationControllerDelegate, UIImagePickerControllerDelegate, UITextFieldDelegate {
     @IBOutlet var nameField: UITextField!
     @IBOutlet var userField: UITextField!
     @IBOutlet var emailField: UITextField!
@@ -16,6 +16,7 @@ class SignInController: UIViewController, UINavigationControllerDelegate, UIImag
     @IBOutlet var saveBtn: UIButton!
     @IBOutlet var chngPhotoBtn: UIButton!
     @IBOutlet var profilePic: UIImageView!
+    @IBOutlet var scrollView:UIScrollView!
     private var picker = UIImagePickerController()
 
     
@@ -60,7 +61,11 @@ class SignInController: UIViewController, UINavigationControllerDelegate, UIImag
                                 (succeeded: Bool, error: NSError?) -> Void in
                                 
                                 if error == nil {
-                                    self.performSegueWithIdentifier("SignedUpSegue", sender: self)
+                                    //self.performSegueWithIdentifier("SignedUpSegue", sender: self)
+                                    let storyboard = UIStoryboard(name: "Main", bundle: nil)
+                                    let tabBarController = storyboard.instantiateViewControllerWithIdentifier("TabControllerVC") as! UITabBarController
+                                    let appDelegate = UIApplication.sharedApplication().delegate as! AppDelegate
+                                    appDelegate.window?.rootViewController = tabBarController
                                 }
                                 else{
                                     
@@ -119,12 +124,25 @@ class SignInController: UIViewController, UINavigationControllerDelegate, UIImag
     override func viewDidLoad() {
         
         super.viewDidLoad()
+        
+        //dismisses keyboard when screen is tapped
+        let tapGesture = UITapGestureRecognizer(target: self, action: Selector("hideKeyboard"))
+        tapGesture.cancelsTouchesInView = true
+        self.view.addGestureRecognizer(tapGesture)
+        
+        self.nameField.delegate = self
+        self.passField.delegate = self
+        self.userField.delegate = self
+        self.emailField.delegate = self
+        
+        
         self.navigationController?.title = "Create An Account"
         self.chngPhotoBtn.layer.borderWidth = 1
         self.chngPhotoBtn.layer.cornerRadius = 5
         self.chngPhotoBtn.layer.borderColor = UIColor.blackColor().CGColor
         self.picker.delegate = self
         self.profilePic.layer.cornerRadius = self.profilePic.frame.size.width/2
+        self.profilePic.clipsToBounds = true
         self.profilePic.backgroundColor = UIColor.grayColor()
         
         //add cancel bar to navigation bar
@@ -139,6 +157,22 @@ class SignInController: UIViewController, UINavigationControllerDelegate, UIImag
         // Dispose of any resources that can be recreated.
     }
     
+    func textFieldShouldReturn(textField: UITextField) -> Bool {
+        self.view.endEditing(true)
+        return false
+    }
+    
+    func hideKeyboard() {
+        self.view.endEditing(true)
+    }
+    
+    func textFieldDidBeginEditing(textField: UITextField) {
+        scrollView.setContentOffset(CGPointMake(0, 200), animated: true)
+    }
+    
+    func textFieldDidEndEditing(textField: UITextField) {
+        scrollView.setContentOffset(CGPointMake(0, 0), animated: true)
+    }
 
     /*
     // MARK: - Navigation