*update idea ignore.
Merge branch 'master' of https://github.com/ybak/final
Merge branch 'master' of https://github.com/ybak/final
*test for git conflict
Merge branch 'master' of https://github.com/ybak/final