core data works

core data
Merge branch 'master' of https://github.com/kainolophobia/futurefriend

Conflicts:
	FutureFriends/FutureFriends/FBEViewController.m