Project Clean up
Merge remote-tracking branch 'parent/master'

Conflicts:
	Halfsies/View Controllers/AddFriendsViewController.m
Merge pull request #3 from jstart/master

Project Clean up