글삐져나오는거 수정
Merge branch 'master' of https://github.com/LikeTalk/liketalk

Conflicts:
	apps/templates/two_people.html
Merge branch 'master' of https://github.com/LikeTalk/liketalk