Merge pull request #26 from KimMinJeong/kmj_branch

Kmj branch
total sort
Merge pull request #27 from KimMinJeong/ksk_branch

total sort
sorting src, jsp