diff --git a/.gitignore b/.gitignore
index b425f09..f51ef96 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,35 +1,68 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
+# Eclipse
+/.classpath
+/.project
+/.settings
 
-### IntelliJ IDEA ###
-.idea/
-*.iws
+# Netbeans
+/nbproject
+
+# We active maven!
+/build.xml
+
+# Maven
+/target
+/dependency-reduced-pom.xml
+*/target
+*/dependency-reduced-pom.xml
+
+# Vim
+.*.sw[a-p]
+
+# Various other potential build files
+/build
+/bin
+/dist
+/manifest.mf
+/MANIFEST.MF
+/META-INF/MANIFEST.MF
+git.properties
+.ssh
+key
+key.pub
+dependency-reduced-pom.xml
+
+# Mac Filesystem Dust
+.DS_Store
+
+# IntelliJ IDEA
 *.iml
 *.ipr
+*.iws
+.idea/
 
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
+#Libraries jar files
+libraries/*.jar
+=======
+# Compiled class file
+*.class
 
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
+# Log file
+*.log
 
-### VS Code ###
-.vscode/
+# BlueJ files
+*.ctxt
 
-### Mac OS ###
-.DS_Store
\ No newline at end of file
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+>>>>>>> 354c5c7d98801e512c3da0913cd1824a9cf4b2cf