Merge pull request Neamar#511 from alexander255/master

Prevent `.DS_Store` and other common system files from accidently being commited

.gitignore

@@ -1,16 +1,115 @@
-# files for the dex VM
+#######################
+# Android development #
+#######################
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the ART/Dalvik VM
 *.dex
 
-# generated files
+# Java class files
+*.class
+
+# Generated files
 bin/
 gen/
-*.apk
 out/
-build/
+
+# Gradle files
 .gradle/
+build/
 
 # Local configuration file (sdk path, etc)
 local.properties
-/.settings/*
-.idea/
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# Intellij
 *.iml
+.idea/workspace.xml
+.idea/libraries
+
+# Keystore files
+*.jks
+
+###########
+# Windows #
+###########
+
+# Windows image file caches
+Thumbs.db
+ehthumbs.db
+
+# Folder config file
+Desktop.ini
+
+# Recycle Bin used on file shares
+$RECYCLE.BIN/
+
+# Windows Installer files
+*.cab
+*.msi
+*.msm
+*.msp
+
+# Windows shortcuts
+*.lnk
+
+#########
+# Linux #
+#########
+
+# Backup files (created by some editors)
+*~
+*.bak
+
+# temporary files which can be created if a process still has a handle open of a deleted file
+.fuse_hidden*
+
+# KDE directory preferences
+.directory
+
+# Linux trash folder which might appear on any partition or disk
+.Trash-*
+
+#########
+# macOS #
+#########
+
+*.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk