diff --git a/scala/.gitignore b/scala/.gitignore
new file mode 100644
index 00000000..5534fac1
--- /dev/null
+++ b/scala/.gitignore
@@ -0,0 +1,19 @@
+/bin/
+
+# OSX Finder
+.DS_Store
+
+# IntelliJ
+.idea
+*.iml
+
+# Eclipse
+.worksheet
+.settings
+.cache
+.cache-main
+.cache-tests
+.project
+.classpath
+
+target/
diff --git a/scala/build.sbt b/scala/build.sbt
index c9cc5d59..6df3d754 100644
--- a/scala/build.sbt
+++ b/scala/build.sbt
@@ -2,6 +2,6 @@ name := "GildedRose"
 
 version := "1.0"
 
-scalaVersion := "2.10.2"
+scalaVersion := "2.12.1"
 
-libraryDependencies += "org.scalatest" % "scalatest_2.10" % "2.0"
+libraryDependencies += "org.scalatest" %% "scalatest" % "3.0.1"
diff --git a/scala/project/.gitignore b/scala/project/.gitignore
new file mode 100644
index 00000000..6ba19f7f
--- /dev/null
+++ b/scala/project/.gitignore
@@ -0,0 +1,2 @@
+project/
+target/
diff --git a/scala/project/build.properties b/scala/project/build.properties
new file mode 100644
index 00000000..27e88aa1
--- /dev/null
+++ b/scala/project/build.properties
@@ -0,0 +1 @@
+sbt.version=0.13.13