Changes before push (about to work on singleton)
no message
Adding gitIgnore and removing unnecessary files from repo
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  oct 10 push masa 2

Conflicts:
	TFE/FBLogInViewController.m
	TFE/FriendTableViewController.m
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  masa group name clean
  tfe group name cleared
  2 files changed format
  adding gitignore
  square one

Conflicts:
	TFE.xcodeproj/project.xcworkspace/xcuserdata/lukesolomon.xcuserdatad/UserInterfaceState.xcuserstate
	TFE.xcodeproj/project.xcworkspace/xcuserdata/mikebando.xcuserdatad/UserInterfaceState.xcuserstate
	TFE/AppDelegate.m
Working on network singleton
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  push notification working 1

Conflicts:
	TFE/SearchSettingViewController.m
Merge branch 'master' of https://github.com/koroket/MKSTFA

# By koroket
# Via koroket
* 'master' of https://github.com/koroket/MKSTFA:
  pictures working
  merged singleton
  push notification working for matching

Conflicts:
	GroupTableViewController.m
	TFE.xcodeproj/project.pbxproj
	TFE/Draggable.h
	TFE/Draggable.m
	TFE/DraggableBackground.m
	TFE/FriendTableViewController.m