회원
Merge branch 'master' of https://github.com/swllno/mahanaim-high-school

Conflicts:
	application/views/main/index.html
메인 로그인 영역