diff --git a/.gitignore b/.gitignore
index 3ef9c153..1a527ca6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,6 +15,11 @@ target/
 ### IntelliJ IDEA ###
 .idea/*
 !.idea/runConfigurations/
+!.idea/.gitignore
+!.idea/compiler.xml
+!.idea/encodings.xml
+!.idea/jarRepositories.xml
+!.idea/misc.xml
 *.iws
 *.iml
 *.ipr
@@ -38,3 +43,13 @@ build/
 ### Project Specific ###
 tmp/
 uploads/
+
+### Temp and backup files ###
+*.backup
+*.backup*
+*.bak
+*.tmp
+*.py
+temp_*.json
+last_part.json
+fix_*.py