test file
Merge pull request #3 from ray515/master

ray test file
Merge pull request #4 from ktsWeb/test

merge dev branches
Merge pull request #5 from ktsWeb/EricDev

push to stg