Remove unused file and update .gitignore

.gitignore

@@ -136,11 +136,10 @@ fabric.properties
 
 ### vscode ###
 .vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
 *.code-workspace
 
 # Documentation
-doc/
+doc/
+
+# CLang
+compile_commands.json

update_upstream_and_merge_into_master.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-git checkout upstream
-git pull https://github.com/pixlra/calyp.git master
-git push origin upstream
-
-git checkout master
-git pull origin master
-git merge upstream
-git push origin master