구성회 - 26일 오전
Merge branch 'master' of github.com:krestine/randomSelectProject

Conflicts:
	RandomSelectProject/src/main/java/com/project/controller/SettingController.java