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

Conflicts:
	.DS_Store
	LinkedInApp4iPhone/.DS_Store
	LinkedInApp4iPhone/Images/.DS_Store
lj