test
Merge branch 'master' of https://github.com/OhByeongYun/1989-class

Conflicts:
	modules/socket/serverConfig.js
	public/js/serverConfig.js
test