Merge conflict

.gitignore

@@ -1,29 +1,65 @@
-# This file is based on https://github.com/github/gitignore/blob/master/Android.gitignore
-*.iml
-.idea/compiler.xml
-.idea/copyright
-.idea/dictionaries
-.idea/gradle.xml
-.idea/libraries
-.idea/inspectionProfiles
-.idea/misc.xml
-.idea/modules.xml
-.idea/runConfigurations.xml
-.idea/tasks.xml
-.idea/workspace.xml
-.gradle
-local.properties
-.DS_Store
-build/
-gradleBuild/
+# Built application files
 *.apk
 *.ap_
+
+# Files for the ART/Dalvik VM
 *.dex
+
+# Java class files
 *.class
+
+# Generated files
 bin/
 gen/
 out/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
 *.log
+
+# Android Studio Navigation editor temp files
 .navigation/
-/captures
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+.idea/caches
+
+# Keystore files
+# Uncomment the following line if you do not want to check your keystore files in.
+#*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
 .externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md