gitignore
Fix untracked files
merge master