Gagan
Merge branch 'master' of https://github.com/BunnyC/Party-App

Conflicts:
	PartyApp.xcodeproj/project.pbxproj