Merge pull request #43 from KimMinJeong/kmj_branch

Kmj branch
merge
merge with kmj
Merge pull request #44 from KimMinJeong/lsg_branch

Lsg branch
modify loginForm