merged Monday
added Facebook login
Merge branch 'TaylorBranch'
add Facebook login and bird class
added friends vc
Merge remote-tracking branch 'origin/messageBran'

Conflicts:
	LoginViewController.m
	SendABird.xcodeproj/project.pbxproj
	SendABird/AppDelegate.m
	SendABird/Base.lproj/Main.storyboard
no changes
Merge branch 'master' into Monday
merged with master