Conflicts:
	.gitignore
	ECSlidingViewController.podspec
	ECSlidingViewController.xcodeproj/project.pbxproj
	ECSlidingViewController/AppDelegate.m
	ECSlidingViewController/InitialSlidingViewController.m
	ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.h
	ECSlidingViewController/Vendor/ECSlidingViewController/ECSlidingViewController.m
	README.md

Keep all changes/deletions form --theirs. The v2.0.0 branch was
re-written from scratch and re-organized.