서버 내용 추가
Merge branch 'master' of https://github.com/LastOne817/DevelopeDiary

Conflicts:
	server.txt