fixed everything
Merge branch 'master' of https://github.com/aakashthumaty/Yo-From

Conflicts:
	Yo From.xcodeproj/project.pbxproj
	Yo From/UsersViewController.m