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

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