I fixed gitignore.
For merging master
Merge branch 'rfrost'
Merge branch 'master' of https://github.com/hongkunyoo/athere-android
I removed conflict at UI.