diff --git a/.gitignore b/.gitignore
index f070d111b06416efc88d69f2196138665ef7147f..4f8e9aab565ffac3c3536f482ba87cccd8dbc83d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,48 @@
-/bin
-/target
+# Mac OS
 .DS_Store
+.AppleDouble
+.LSOverride
+
+
+# TeeTime specific
 teetime.log
 /src/main/resources/hugetext.txt
+
+# Java
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
\ No newline at end of file