Horoscope2

.gitignore

@@ -0,0 +1,42 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+/*/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+.DS_Store

README.md

@@ -9,6 +9,7 @@ Lesson plans, activities and assignments for Unit 1 will be posted here!
  0 | Apr 21 | 0 | [Android Prework](lessons/0_Android-Prework.md)
  1 | Apr 23 | 0 | [Android Studio & Structure of an Android Project](lessons/1_Android-Studio-Structure-of-Android-Project.md)
  2 | Apr 25 | 0 | [Inheritance and Interfaces](lessons/2_Interfaces-And-Inheritance)
+<<<<<<< HEAD
  3 | Apr 26 | 1 | [Generics and Abstract Classes](/lessons/3_Generics-and-Abstract-Classes.md)
  4 | Apr 28 | 1 | [Anatomy of the Android Manifest](/lessons/4_Anatomy_Manifest.md)
  5 | Apr 30 | 1 | [OOP and Intents](exercises/5_OOP-and-Intents)
@@ -19,11 +20,22 @@ Lesson plans, activities and assignments for Unit 1 will be posted here!
  10 | May 09 | 2 | [Github and Debugging](lessons/10_Github-Debugging.md)
  11 | May 10 | 3 | [UI Basics](lessons/11_Android-UI-Basics.md)
  12 | May 12 | 3 | [Layouts](lessons/12_Layouts.md)
+=======
+ 3 | Apr 26 | 0 | [Generics and Abstract Classes](/lessons/3_Generics-and-Abstract-Classes.md)
+ 4 | Apr 28 | 1 | [Anatomy of the Android Manifest](/lessons/4_Anatomy_Manifest.md)
+ 5 | May 02 | 1 | [Android Resources] (lessons/6_Android-Resources.md)
+ 6 | May 03 | 1 | [Activity Lifecycle](lessons/7_Android-Lifecycle.md)
+>>>>>>> gmsyrimis
 ### Homework
 
 | Due Date | Homework|
 |---|---|
 | Apr 25 | <ul><li>**READ** Think Piece: [How to Impress an Interviewer](https://medium.com/@joulee/how-to-impress-an-interviewer-c210d9d8e84a)</li><li>**WRITE** a Medium post about something technical or non technical you learned this week</li><li>**GUEST SPEAKER** [Vin Vacanti](speakers/vin-vacanti.md)</li></ul>
+<<<<<<< HEAD
 | May 1 | <ul><li>**CODE:** [OOP](homework/week-0.md)</li><li>**WATCH** Think Piece: [Carol Dweck: The power of believing that you can improve](http://www.ted.com/talks/carol_dweck_the_power_of_believing_that_you_can_improve)</li><li>**WRITE** a Medium post about something technical or non technical you learned this week</li></ul>
 | May 8 | <ul><li>**CODE:** [Horoscope App](homework/week-1.md)</li><li>**READ** Think Piece: [Unlearning Helplessness](http://braythwayt.com/2015/01/20/learned-helplessness.html)</li><li>**WRITE** a Medium post about something technical or non technical you learned this week</li></ul>
 | May 15 | <ul><li>**CODE:** [Revenge of the Horoscope App](homework/week-2.md)
+=======
+| May 1 | <ul><li>**CODE:** [OOP](https://github.com/accesscode-2-1/unit-1/blob/master/homework/week-0.md)</li><li>**WATCH** Think Piece: [Carol Dweck: The power of believing that you can improve](http://www.ted.com/talks/carol_dweck_the_power_of_believing_that_you_can_improve)</li><li>**WRITE** a Medium post about something technical or non technical you learned this week</li></ul>
+| May 8 | <ul><li>**CODE:** [Horoscope App](https://github.com/accesscode-2-1/unit-1/blob/master/homework/week-1.md)</li><li>**READ** Think Piece: [Unlearning Helplessness](http://braythwayt.com/2015/01/20/learned-helplessness.html)</li><li>**WRITE** a Medium post about something technical or non technical you learned this week</li></ul>
+>>>>>>> gmsyrimis

exercises/5_OOP-and-Intents/MyPhone/.gradle/2.2.1/taskArtifacts/cache.properties

@@ -0,0 +1 @@
+#Thu Apr 30 21:38:24 EDT 2015