diff --git a/.gitignore b/.gitignore
index 5b521d0587015867ac1a23fa00be3f3fce080b9f..015283e397942d9251b115e8c1cf90c0d77f63ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,34 @@
-a6
+###
+ # GitIgnore file for C Language projects.
+ # See https://git-scm.com/docs/gitignore for documentation.
+ #
+ # Version 1.0
+ ##
+
+
+# Ignore environment settings.
+.vs/
+.vscode/
+vs/
+vscode/
+
+
+# Ignore temporary files.
+[Tt]emp/
+[Tt]empfiles/
+[Tt]emp_files/
+*.tmp
+*.temp
+
+
+# Ignore compiled files.
+*.o
+*.obj
+*.out
+
+
+# Ignore logfiles.
+[Ll]og/
+[Ll]ogs/
+*.log
+*.log.*
diff --git a/makefile b/makefile
index 66789df3cbacef45ae4b93fdaa615f65769709b8..f90bd2fadfa87993165462afde924c489e2aca76 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
 all:
-	gcc -Wall -Wpedantic -std=c99 Main.c error.c HelperFunctions.c -g -o a6 -pthread -lmagic
+	gcc -Wall -Wpedantic -std=c99 Main.c error.c HelperFunctions.c -g -o a6.out -pthread -lmagic
 test:
-	gcc -Wall -Wpedantic -std=c99 Main_No_Threads.c error.c HelperFunctions.c -g -o a6 -pthread -lmagic
+	gcc -Wall -Wpedantic -std=c99 Main_No_Threads.c error.c HelperFunctions.c -g -o a6.out -pthread -lmagic