From a802053ef7aed45d60ab32531ab9791df29564cc Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Fri, 15 Jul 2016 09:33:07 -0400
Subject: [PATCH] Update .gitignore

---
 .gitignore | 46 ++++++++++++++++------------------------------
 1 file changed, 16 insertions(+), 30 deletions(-)

diff --git a/.gitignore b/.gitignore
index b5365d8c1..655fdf419 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,22 @@
-#built application files
-*.apk
 *.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
+*.apk
 *.class
-
-# generated files
-bin/
-gen/
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Windows thumbnail db
-Thumbs.db
-
-# OSX files
+*.dex
+*.iml
+*.local.*
+*.swp
+*.trace
+*~
 .DS_Store
-
-# Eclipse project files
 .classpath
-.project
-
-# Android Studio
-.idea
-#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
 .gradle
-build/
-*.iml
-
+.idea
+.project
+Thumbs.db
 art/
-*.actual.png
+bin/
+build/
+captures/
+docs/
+gen/
+local.properties