diff --git a/Java2-Proj1.iml b/Java2-Proj1.iml
new file mode 100644
index 0000000000000000000000000000000000000000..c90834f2d607afe55e6104d8aa2cdfffb713f688
--- /dev/null
+++ b/Java2-Proj1.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/res/PROJ_CODE.zip b/res/PROJ_CODE.zip
new file mode 100644
index 0000000000000000000000000000000000000000..3ba2fd77bf6ce45ef493e08491315fed680b88d5
Binary files /dev/null and b/res/PROJ_CODE.zip differ
diff --git a/res/map_test.java b/res/map_test.java
index 7e52b8235f7a6e1968bc51b7341f8917f51d0652..950db70033fcaf099b5ac6bba0ca5393250fc6ce 100644
--- a/res/map_test.java
+++ b/res/map_test.java
@@ -3,49 +3,32 @@
 // than looking for an earthquake ...
 
 private final String[] cities = {
-				"Hong Kong,22.283,114.167",
-
-                           	"Istanbul,41.017,28.950",
-
-                           	"Singapore,1.283,103.833",
-
-                           	"Cape Town,-33.933,18.417",
-
-                           	"Panama,8.983,-79.517",
-
-                           	"Punta Arenas,-53.167,-70.933",
+		"Hong Kong,22.283,114.167",
+		"Istanbul,41.017,28.950",
+		"Singapore,1.283,103.833",
+		"Cape Town,-33.933,18.417",
+		"Panama,8.983,-79.517",
+		"Punta Arenas,-53.167,-70.933",
  // Magellan Straits
-
-                           	"Adelaide,-34.933,138.600",
+		"Adelaide,-34.933,138.600",
  // Southern Australia
-    
-                       		"Miami,25.783,-80.217",
-
-                           	"Lisbon,38.717,-9.133",
- 
-                          	"Quebec,46.817,-71.217",
- 
-                          	"Tunis,36.800,10.183",
+		"Miami,25.783,-80.217",
+		"Lisbon,38.717,-9.133",
+		"Quebec,46.817,-71.217",
+		"Tunis,36.800,10.183",
  // Northern Africa
-
-                           	"Douala,4.050,9.700",
+		"Douala,4.050,9.700",
  // Western Africa, Equator
- 
-                          	"Dakar,14.700,-17.450",
+		"Dakar,14.700,-17.450",
  // Western Africa
-                           
-				"Djibouti,11.583,43.150",
+		"Djibouti,11.583,43.150",
  // Eastern Africa
-        
-                   		"Reykjavík,64.133,-21.933",
+		"Reykjavík,64.133,-21.933",
  // Iceland
-
-                           	"Trivandrum,8.483,76.950",
+		"Trivandrum,8.483,76.950",
  // Southern bit of India
-
-                           	"Recife,-8.050,-34.900",
+		"Recife,-8.050,-34.900",
  // North-East Brazil
-
-                           	"Baku,40.400,49.883"
+		"Baku,40.400,49.883"
 };
- // Caspian sea
+ // Caspian sea
\ No newline at end of file
diff --git a/res/tableviewexample.zip b/res/tableviewexample.zip
new file mode 100644
index 0000000000000000000000000000000000000000..57ddc0fd8ac90da9ad1a023618a9b1cf59689161
Binary files /dev/null and b/res/tableviewexample.zip differ
diff --git a/src/InputReader.java b/src/InputReader.java
new file mode 100644
index 0000000000000000000000000000000000000000..1111e94cfeb8dd28556a94e1f90e466dbc5d17a1
--- /dev/null
+++ b/src/InputReader.java
@@ -0,0 +1,14 @@
+import java.util.InputMismatchException;
+import java.util.Scanner;
+import java.util.regex.*;
+
+public class InputReader {
+    private Scanner scanner = new Scanner(System.in);
+    public String readUTC() {
+        String ret = scanner.nextLine().replaceAll("\\s*", "");
+        String pattern = "(\\d{4}-\\d{2}-\\d{2})"+"(\\d{2}:\\d{2}:\\d{2}.\\d)";
+        MatchResult match = scanner.match();
+        if(ret.matches(pattern)) return match.group(0) + " " + match.group(1);
+        return readUTC();
+    }
+}
diff --git a/src/Main.java b/src/Main.java
new file mode 100644
index 0000000000000000000000000000000000000000..77dcf28360c2527dbcecef7997eb8cf7e87e6aef
--- /dev/null
+++ b/src/Main.java
@@ -0,0 +1,6 @@
+public class Main {
+    public static void main(String[] args) {
+        InputReader inputReader = new InputReader();
+        System.out.println(inputReader.readUTC());
+    }
+}