Merge "Add vscode files to gitignore"