fix untracked files
Merge branch 'master' into authenticate