diff --git a/.gitignore b/.gitignore
index 32a12cc23c4fccd2c7e53a7699b920bc5cbb66b5..09c9a310e4530b6304624059096c0a4500db0ad3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,26 @@
+# VLC
 /vlc/
+
+# Android .so
 /android-libs/*.so
+
+# Local configuration
 local.properties
+env.sh
+
+# OS specific
 .DS_Store
-*.keystore
+.directory
 *~
 .*.swp
-.directory
-env.sh
+Thumbs.db
+
+# Signage keys
+*.keystore
+
+# Eclipse
+#.classpath
+#.project
+
+# Android Studio
+.idea