tesing ignore .idea
add footer
aa
resolve conflict
Merge branch 'master' of github.com:lishanping89/test