merging
Merge branch 'master' of https://github.com/stanri/kswak
testing login
merging
merging