delete .idea dir
Merge branch 'master' of https://github.com/doubleyeh/testjfinal