diff --git a/.gitignore b/.gitignore
index f20e1f8..4f9104c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,7 +22,6 @@ build/
 
 # Local configuration file (sdk path, etc)
 local.properties
-app/build.gradle # contains signing configs
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -45,6 +44,7 @@ captures/
 
 # Keystore files
 *.jks
+keystore.properties
 
 # External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
diff --git a/app/build.gradle b/app/build.gradle
new file mode 100644
index 0000000..bba2274
--- /dev/null
+++ b/app/build.gradle
@@ -0,0 +1,52 @@
+
+apply plugin: 'com.android.application'
+
+// Load keystore properties
+def keystorePropertiesFile = rootProject.file("keystore.properties")
+def keystoreProperties = new Properties()
+keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
+android {
+	signingConfigs {
+		config {
+			keyAlias keystoreProperties['keyAlias']
+			keyPassword keystoreProperties['keyPassword']
+			storeFile file(keystoreProperties['storeFile'])
+			storePassword keystoreProperties['storePassword']
+		}
+	}
+	compileSdkVersion 23
+	buildToolsVersion "23.0.3"
+	defaultConfig {
+		applicationId "us.keithirwin.tracman"
+		minSdkVersion 14
+		targetSdkVersion 23
+		versionCode 9
+		versionName "0.1.8"
+	}
+	buildTypes {
+		release {
+			minifyEnabled false
+			proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+			signingConfig signingConfigs.config
+			zipAlignEnabled true
+		}
+	}
+}
+
+dependencies {
+	compile fileTree(dir: 'libs', include: ['*.jar'])
+	testCompile 'junit:junit:4.12'
+	compile 'com.android.support:appcompat-v7:23.2.0'
+	compile 'com.android.support:support-v4:23.2.0'
+	compile 'com.android.support:design:23.2.0'
+	compile 'com.google.android.gms:play-services-location:9.8.0'
+	compile 'com.google.android.gms:play-services-auth:9.8.0'
+	compile ('com.github.nkzawa:socket.io-client:0.4.1'){
+		exclude group: 'org.json', module: 'json'
+	}
+	compile 'com.squareup.retrofit2:retrofit:2.0.0-beta3'
+	compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta3'
+}
+
+apply plugin: 'com.google.gms.google-services'
\ No newline at end of file
diff --git a/app/keystore.jks b/app/keystore.jks
deleted file mode 100644
index 1109e72..0000000
Binary files a/app/keystore.jks and /dev/null differ