첫 커밋
Merge branch 'master' of https://github.com/kciter/temp_server

Conflicts:
	.gitignore