커밋 오류로 재 커밋
Merge remote-tracking branch 'origin/master'

Conflicts:
	server/publications.js