Merge pull request #104 from cca-team3-webproject/kwak

Kwak
Merge pull request #107 from cca-team3-webproject/master

Merge pull request #104 from cca-team3-webproject/kwak