정답체크
Merge branch 'client' into server

Conflicts:
	application/controllers/main.php