lj
ljMerge branch 'master' of github.com:liaojia/LinkedInApp4iPhone

Conflicts:
	.DS_Store
ljMerge branch 'master' of github.com:liaojia/LinkedInApp4iPhone