add
Merge branch 'master' of https://github.com/ranian129/handTalkie

Conflicts:
	talkie/src/main/webapp/friend/friendList.html
add