Fixed merge conflicts

.gitignore

@@ -1,3 +1,28 @@
+# ---> Java
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.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*
+replay_pid*
 ### IntelliJ IDEA ###
 out/
 !**/src/main/**/out/

README.md

@@ -1,2 +1,3 @@
 # ThoriumBusParser
+
 A simple Java application to parse public transport data sources