fixed untracked files
before pull
resolve conflict
Merge branch 'master' of github.com:danielchang1991/appleincident
ui changes