Add gitignore
Merge branch 'master' of https://github.com/gaodayue/deviceusageapp

Conflicts:
.gitignore
merge