Merge branch 'master' of

https://github.com/jeffryang24/2048-java-console.git

Conflicts:
	2048/pom.xml

Author: jeffryang24

.travis.yml

@@ -0,0 +1,2 @@
+language: java
+script: mvn clean install

2048/.travis.yml

@@ -0,0 +1,2 @@
+language: java
+script: mvn clean install

2048/backup_code.txt

@@ -1,4 +1,4 @@
-#2048 Java Console
+#2048 Java Console [![Build Status](https://travis-ci.org/jeffryang24/2048-java-console.svg?branch=master)](https://travis-ci.org/jeffryang24/2048-java-console) [![Join the chat at https://gitter.im/2048-java-console/Lobby](https://badges.gitter.im/2048-java-console/Lobby.svg)](https://gitter.im/2048-java-console/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 A simple 2048 game based on Java language. You can run it by executing the java binary from bin folder.
 
 ###Example 
@@ -25,4 +25,4 @@ This project is dedicated for our Advanced OOP course. Our team member: <br />
  1. Jeffry Angtoni (1801425975)
  2. Benny Susanto (1801416743)
  3. Satrio Wibisono (1801437243)
- 4. M Syidad Al'Abror (1801445680)
+ 4. M Syidad Al'Abror (1801445680)

2048/backup_code_v1.1

@@ -0,0 +1,21 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>2048</groupId>
+  <artifactId>2048-java</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <name>2048</name>
+  <description>2048 - Maven</description>
+  <build>
+    <sourceDirectory>2048/src</sourceDirectory>
+    <plugins>
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.5.1</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>