diff --git a/.gitignore b/.gitignore
index ad16a11..1995246 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,30 +1,88 @@
-*.metadata/
-*.class
-/GameProject/doc/
-/GameProject/log/
-/GameProject/log\\log4j.log
-/GameProject/highscore.txt
-/GameProject/bin/
-.metadata/.log
-.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
-.metadata/version.ini
-.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.markers.snap
-.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.syncinfo.snap
-.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.markers.snap
-.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.syncinfo.snap
-.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
-.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
-.metadata/.plugins/org.eclipse.core.resources/4.snap
-.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
-
-.metadata/.log
-.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
-GameProject/log\log4j.log
-.metadata/.plugins/org.eclipse.core.resources/4.snap
-.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
-.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
-.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.syncinfo.snap
-.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.syncinfo.snap
-.metadata/.plugins/org.eclipse.core.resources/.projects/GameProject/.markers.snap
-.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.syncinfo.snap
-.metadata/.plugins/org.eclipse.core.resources/.projects/.org.eclipse.egit.core.cmp/.markers.snap
+# General
+.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
+
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+.recommenders
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# PyDev specific (Python IDE for Eclipse)
+*.pydevproject
+
+# CDT-specific (C/C++ Development Tooling)
+.cproject
+
+# CDT- autotools
+.autotools
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific (PHP Development Tools)
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# Tern plugin
+.tern-project
+
+# TeXlipse plugin
+.texlipse
+
+# STS (Spring Tool Suite)
+.springBeans
+
+# Code Recommenders
+.recommenders/
+
+# Annotation Processing
+.apt_generated/
+.apt_generated_test/
+
+# Scala IDE specific (Scala & Java development for Eclipse)
+.cache-main
+.scala_dependencies
+.worksheet
+
+# Uncomment this line if you wish to ignore the project description file.
+# Typically, this file would be tracked if it contains build/dependency configurations:
+#.project
\ No newline at end of file