9 files changed, 24 insertions, 22 deletions
diff --git a/.gitignore b/.gitignore
index 2acf61b..173963b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,20 @@
-# build files
-**/*.class
+## OS generated garbage
+**/.DS_Store*
+**/ehtumbs.db
+**/Icon?
+**/Thumbs.db
+
+## Editors
+**/*~
+**/*.swp
+
+## Gradle
+target
+*/target
 
-# build directories
 build
-jar
+*/build
+
+gradle
+.gradle
+.m2
diff --git a/Makefile b/Makefile
index 13da9d5..b038e89 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,2 @@
-MAINCLASS := Subconscious
-
-run: build
-	cd bin && java $(MAINCLASS)
-
-pack: build
-	echo "Main-Class: $(MAINCLASS)" > jar/manifest.txt
-	jar cvfm jar/$(MAINCLASS).jar jar/manifest.txt -C bin/ .
-
-build: dirs
-	javac -d bin/ src/*.java
-
-dirs:
-	mkdir -p src bin jar
-
-clean:
-	rm jar/*
-	rm bin/*
+all:
+	gradle run
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..7a06cf2
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,4 @@
+apply plugin: 'java'
+apply plugin: 'application'
+
+mainClassName = 'Subconscious'
diff --git a/src/Actor.java b/src/main/java/Actor.java
index 207d6e6..207d6e6 100644
--- a/src/Actor.java
+++ b/src/main/java/Actor.java
diff --git a/src/Map.java b/src/main/java/Map.java
index 031e922..031e922 100644
--- a/src/Map.java
+++ b/src/main/java/Map.java
diff --git a/src/Scene.java b/src/main/java/Scene.java
index a2949fd..a2949fd 100644
--- a/src/Scene.java
+++ b/src/main/java/Scene.java
diff --git a/src/Subconscious.java b/src/main/java/Subconscious.java
index b63eb23..b63eb23 100644
--- a/src/Subconscious.java
+++ b/src/main/java/Subconscious.java
diff --git a/src/Tile.java b/src/main/java/Tile.java
index cbdeda4..cbdeda4 100644
--- a/src/Tile.java
+++ b/src/main/java/Tile.java
diff --git a/src/WorldScene.java b/src/main/java/WorldScene.java
index 6dff04a..6dff04a 100644
--- a/src/WorldScene.java
+++ b/src/main/java/WorldScene.java