Merge pull request #131 from SpartaHack/develop

Merge in Develop

Author: ryanrampage1

.DS_Store

@@ -29,7 +29,20 @@ proguard/
 
 *.idea
 */Keys.java
+`
+# Android Studio
+*.iml
+.idea
+.idea/workspace.xml 
+.gradle
+build/
 
 .idea/*
 app/app.iml
-*.iml
+
+# Windows thumbnail db
+Thumbs.db
+
+# OSX files
+.DS_Store
+gradle-wrapper.properties

.gitignore

@@ -0,0 +1,27 @@
+language: android
+android:
+  components:
+    # use the latest revision of Android SDK Tools
+    - platform-tools
+    - tools
+
+    # The BuildTools version used by your project
+    - build-tools-23.0.3
+
+    # The SDK version used to compile your project
+    - android-24
+
+    # Additional components
+    - extra-google-google_play_services
+    - extra-google-m2repository
+    - extra-android-m2repository
+    - addon-google_apis-google-19
+
+    # Specify at least one system image,
+    # if you need to run emulator(s) during your tests
+    - sys-img-armeabi-v7a-android-22
+    - sys-img-x86-android-17
+
+jdk:
+  - oraclejdk8
+  - oraclejdk7

.idea/.name

@@ -1,2 +1,12 @@
-# SpartaHack Android
-The 2017 Android application for SpartaHack 
+![](https://raw.githubusercontent.com/SpartaHack/SpartaHack-Android/develop/graphics/featureGraphic.png)
+
+The SpartaHack 2017 Android app allows attendees and sponsors to view schedules, venue maps and to receive notifications about meals and activities. Participants can optionally log in using their SpartaHack credentials to view their unique check-in QR code and to use the mentorship portal for receiving technical help. Our app is now available on Google Play.
+
+<a href="https://play.google.com/store/apps/details?id=com.spartahack.spartahack17"><img alt="Get it on Google Play" src="https://play.google.com/intl/en_us/badges/images/generic/en-play-badge.png" height=50px/></a>  
+
+## Screenshots
+
+![](https://raw.githubusercontent.com/SpartaHack/SpartaHack-Android/develop/graphics/notif.png)
+![](https://raw.githubusercontent.com/SpartaHack/SpartaHack-Android/develop/graphics/guide.png)
+![](https://raw.githubusercontent.com/SpartaHack/SpartaHack-Android/develop/graphics/help.png)
+![](https://raw.githubusercontent.com/SpartaHack/SpartaHack-Android/develop/graphics/profile.png)