untracked .DS_Store
removed some git tracking
Merge branch 'master' of github.com:onenoc/memo