add
Merge branch 'master' of github.com:xiuzhaoyang/hack

Conflicts:
	hack/hack.xcodeproj/project.pbxproj
	hack/hack/myViewController/detailViewController.xib
	hack/hack/myViewController/locationViewController.mm