[Changelog]
[Changelog]

Conflicts:
	CHANGELOG.md

ashfurrow/CocoaPods,vivekshukla-mob-ibtech/Repository,mglidden/CocoaPods,Ashton-W/CocoaPods,mglidden/CocoaPods,orta/CocoaPods,mglidden/CocoaPods,segiddins/CocoaPods