create branch 2
branch 2 content
new feature
Merge branch 'EMNetworking_test2' into EMNetworking_test

This reverts commit 6611326dd9a4fc2fc1c8ea1aa4272c34bc3de933.

Conflicts:

EMNetworking/EMNetworking.xcodeproj/project.xcworkspace/xcuserdata/hoshi
sakaichen.xcuserdatad/UserInterfaceState.xcuserstate
	EMNetworking/EMNetworking/ViewController.m