diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e787293..ac70d07 100755
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -56,6 +56,10 @@
             android:name=".StartActivity" >
         </activity>
         
+                <activity
+            android:name=".EnvioMailActivity" >
+        </activity>
+        
         <service android:name=".AlarmChecker" />
         
    
diff --git a/Entrega.zip b/Entrega.zip
new file mode 100644
index 0000000..503003f
Binary files /dev/null and b/Entrega.zip differ
diff --git a/bin/AndProject.apk b/bin/AndProject.apk
index a8d0638..a59c0e0 100644
Binary files a/bin/AndProject.apk and b/bin/AndProject.apk differ
diff --git a/bin/classes.dex b/bin/classes.dex
index e088ac2..96ab534 100755
Binary files a/bin/classes.dex and b/bin/classes.dex differ
diff --git a/bin/classes/bonsai/app/AndroidProjectActivity.class b/bin/classes/bonsai/app/AndroidProjectActivity.class
index 41fe4ac..241d000 100644
Binary files a/bin/classes/bonsai/app/AndroidProjectActivity.class and b/bin/classes/bonsai/app/AndroidProjectActivity.class differ
diff --git a/bin/classes/bonsai/app/BonsaiActivity.class b/bin/classes/bonsai/app/BonsaiActivity.class
index 77b7b5e..0d25167 100644
Binary files a/bin/classes/bonsai/app/BonsaiActivity.class and b/bin/classes/bonsai/app/BonsaiActivity.class differ
diff --git a/bin/classes/bonsai/app/EditBonsaiActivity.class b/bin/classes/bonsai/app/EditBonsaiActivity.class
index 5c635cc..a3c88bd 100644
Binary files a/bin/classes/bonsai/app/EditBonsaiActivity.class and b/bin/classes/bonsai/app/EditBonsaiActivity.class differ
diff --git a/bin/classes/bonsai/app/EnvioMailActivity$1.class b/bin/classes/bonsai/app/EnvioMailActivity$1.class
new file mode 100644
index 0000000..82ef328
Binary files /dev/null and b/bin/classes/bonsai/app/EnvioMailActivity$1.class differ
diff --git a/bin/classes/bonsai/app/EnvioMailActivity.class b/bin/classes/bonsai/app/EnvioMailActivity.class
new file mode 100644
index 0000000..b89000d
Binary files /dev/null and b/bin/classes/bonsai/app/EnvioMailActivity.class differ
diff --git a/bin/classes/bonsai/app/MoreActivity$1.class b/bin/classes/bonsai/app/MoreActivity$1.class
new file mode 100644
index 0000000..d00d7d6
Binary files /dev/null and b/bin/classes/bonsai/app/MoreActivity$1.class differ
diff --git a/bin/classes/bonsai/app/MoreActivity.class b/bin/classes/bonsai/app/MoreActivity.class
index 443aeb8..377070e 100644
Binary files a/bin/classes/bonsai/app/MoreActivity.class and b/bin/classes/bonsai/app/MoreActivity.class differ
diff --git a/bin/classes/bonsai/app/MyReceiver.class b/bin/classes/bonsai/app/MyReceiver.class
index a41d795..70a77ce 100644
Binary files a/bin/classes/bonsai/app/MyReceiver.class and b/bin/classes/bonsai/app/MyReceiver.class differ
diff --git a/bin/classes/bonsai/app/R$drawable.class b/bin/classes/bonsai/app/R$drawable.class
index bf6c678..eafef5a 100644
Binary files a/bin/classes/bonsai/app/R$drawable.class and b/bin/classes/bonsai/app/R$drawable.class differ
diff --git a/bin/classes/bonsai/app/R$id.class b/bin/classes/bonsai/app/R$id.class
index e7bbe7a..b961627 100644
Binary files a/bin/classes/bonsai/app/R$id.class and b/bin/classes/bonsai/app/R$id.class differ
diff --git a/bin/classes/bonsai/app/R$layout.class b/bin/classes/bonsai/app/R$layout.class
index 3faf13f..4684772 100644
Binary files a/bin/classes/bonsai/app/R$layout.class and b/bin/classes/bonsai/app/R$layout.class differ
diff --git a/bin/classes/bonsai/app/R$menu.class b/bin/classes/bonsai/app/R$menu.class
index 0e3fe3c..39854ec 100644
Binary files a/bin/classes/bonsai/app/R$menu.class and b/bin/classes/bonsai/app/R$menu.class differ
diff --git a/bin/classes/bonsai/app/R$string.class b/bin/classes/bonsai/app/R$string.class
index 91766fe..9924b92 100644
Binary files a/bin/classes/bonsai/app/R$string.class and b/bin/classes/bonsai/app/R$string.class differ
diff --git a/bin/classes/bonsai/app/SelectBonsaiActivity.class b/bin/classes/bonsai/app/SelectBonsaiActivity.class
index 70d2205..d893057 100644
Binary files a/bin/classes/bonsai/app/SelectBonsaiActivity.class and b/bin/classes/bonsai/app/SelectBonsaiActivity.class differ
diff --git a/bin/classes/bonsai/app/StartActivity.class b/bin/classes/bonsai/app/StartActivity.class
index 761c759..e4ec7ce 100644
Binary files a/bin/classes/bonsai/app/StartActivity.class and b/bin/classes/bonsai/app/StartActivity.class differ
diff --git a/bin/classes/bonsai/app/TaskActivity.class b/bin/classes/bonsai/app/TaskActivity.class
index eb23262..43983f8 100644
Binary files a/bin/classes/bonsai/app/TaskActivity.class and b/bin/classes/bonsai/app/TaskActivity.class differ
diff --git a/bin/classes/bonsai/app/weather/Weather.class b/bin/classes/bonsai/app/weather/Weather.class
index 68064d0..b167986 100644
Binary files a/bin/classes/bonsai/app/weather/Weather.class and b/bin/classes/bonsai/app/weather/Weather.class differ
diff --git a/bin/res/drawable/disease.png b/bin/res/drawable/disease.png
new file mode 100644
index 0000000..d4573d4
Binary files /dev/null and b/bin/res/drawable/disease.png differ
diff --git a/bin/resources.ap_ b/bin/resources.ap_
index ef9d820..f2dfb9a 100644
Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ
diff --git a/gen/bonsai/app/R.java b/gen/bonsai/app/R.java
index 45534de..802fc99 100755
--- a/gen/bonsai/app/R.java
+++ b/gen/bonsai/app/R.java
@@ -20,55 +20,67 @@ public static final class drawable {
         public static final int chance_of_snow=0x7f020002;
         public static final int chance_of_storm=0x7f020003;
         public static final int cloudy=0x7f020004;
-        public static final int donate=0x7f020005;
-        public static final int dust=0x7f020006;
-        public static final int escaledlogo=0x7f020007;
-        public static final int fog=0x7f020008;
-        public static final int haze=0x7f020009;
-        public static final int ic_launche=0x7f02000a;
-        public static final int ic_launcher=0x7f02000b;
-        public static final int ic_menu_help=0x7f02000c;
-        public static final int ic_pode=0x7f02000d;
-        public static final int ic_tab_bonsai=0x7f02000e;
-        public static final int ic_tab_calendar=0x7f02000f;
-        public static final int ic_tab_more=0x7f020010;
-        public static final int ic_tab_selectbonsai=0x7f020011;
-        public static final int ic_task=0x7f020012;
-        public static final int ic_transplant=0x7f020013;
-        public static final int ic_water=0x7f020014;
-        public static final int icy=0x7f020015;
-        public static final int mist=0x7f020016;
-        public static final int mostly_sunny=0x7f020017;
-        public static final int sleet=0x7f020018;
-        public static final int smoke=0x7f020019;
-        public static final int snow=0x7f02001a;
-        public static final int storm=0x7f02001b;
-        public static final int sunny=0x7f02001c;
-        public static final int task=0x7f02001d;
-        public static final int thunderstorm=0x7f02001e;
+        public static final int disease=0x7f020005;
+        public static final int donate=0x7f020006;
+        public static final int dust=0x7f020007;
+        public static final int escaledlogo=0x7f020008;
+        public static final int fog=0x7f020009;
+        public static final int haze=0x7f02000a;
+        public static final int ic_launche=0x7f02000b;
+        public static final int ic_launcher=0x7f02000c;
+        public static final int ic_menu_help=0x7f02000d;
+        public static final int ic_pode=0x7f02000e;
+        public static final int ic_tab_bonsai=0x7f02000f;
+        public static final int ic_tab_calendar=0x7f020010;
+        public static final int ic_tab_more=0x7f020011;
+        public static final int ic_tab_selectbonsai=0x7f020012;
+        public static final int ic_task=0x7f020013;
+        public static final int ic_transplant=0x7f020014;
+        public static final int ic_water=0x7f020015;
+        public static final int icy=0x7f020016;
+        public static final int mist=0x7f020017;
+        public static final int mostly_sunny=0x7f020018;
+        public static final int sleet=0x7f020019;
+        public static final int smoke=0x7f02001a;
+        public static final int snow=0x7f02001b;
+        public static final int storm=0x7f02001c;
+        public static final int sunny=0x7f02001d;
+        public static final int task=0x7f02001e;
+        public static final int thunderstorm=0x7f02001f;
     }
     public static final class id {
         public static final int ImageView01=0x7f07000d;
-        public static final int MnuOpc1=0x7f070030;
+        public static final int LinearLayout01=0x7f07002d;
+        public static final int LinearLayout02=0x7f07002e;
+        public static final int LinearLayout03=0x7f070031;
+        public static final int LinearLayout04=0x7f070034;
+        public static final int MnuOpc1=0x7f07003d;
+        public static final int MnuOpc2=0x7f07003e;
         public static final int bonsaiImage=0x7f070002;
         public static final int bonsairowtext=0x7f07001b;
         public static final int btnCountry=0x7f07002a;
         public static final int btnPostCode=0x7f070028;
+        public static final int btnSend=0x7f070038;
         public static final int button1=0x7f070024;
         public static final int button2=0x7f070025;
         public static final int cancelButton=0x7f07001e;
-        public static final int donatebutton=0x7f07002e;
+        public static final int chkAttachment=0x7f070037;
+        public static final int contactbutton=0x7f07003b;
+        public static final int donatebutton=0x7f07003a;
         public static final int editAge=0x7f070021;
         public static final int editCountry=0x7f070029;
         public static final int editHeight=0x7f070022;
         public static final int editName=0x7f07001f;
         public static final int editPostCode=0x7f070027;
+        public static final int etBody=0x7f070036;
+        public static final int etEmail=0x7f070030;
+        public static final int etSubject=0x7f070033;
         public static final int familySpinner=0x7f070020;
         public static final int footer=0x7f070016;
         public static final int imageButton1=0x7f070019;
         public static final int imageButton2=0x7f07001a;
         public static final int imageButton3=0x7f07002c;
-        public static final int imageView1=0x7f07002f;
+        public static final int imageView1=0x7f07003c;
         public static final int imageView2=0x7f07000a;
         public static final int imageView4=0x7f070010;
         public static final int imageView5=0x7f070013;
@@ -91,11 +103,14 @@ public static final class id {
         public static final int textTemperature=0x7f070014;
         public static final int textTransplant=0x7f070011;
         public static final int textView1=0x7f07001c;
-        public static final int textView2=0x7f07002d;
+        public static final int textView2=0x7f070039;
         public static final int textView3=0x7f070006;
         public static final int textWater=0x7f07000b;
         public static final int textYears=0x7f070005;
         public static final int textweather=0x7f070007;
+        public static final int txtForBody=0x7f070035;
+        public static final int txtForEmail=0x7f07002f;
+        public static final int txtForSubject=0x7f070032;
         public static final int waterButton=0x7f070017;
     }
     public static final class layout {
@@ -103,16 +118,18 @@ public static final class layout {
         public static final int bonsai_row=0x7f030001;
         public static final int calendar=0x7f030002;
         public static final int editbonsai=0x7f030003;
-        public static final int gallery=0x7f030004;
-        public static final int main=0x7f030005;
-        public static final int more=0x7f030006;
-        public static final int selectbonsai=0x7f030007;
-        public static final int start=0x7f030008;
-        public static final int task=0x7f030009;
-        public static final int task_row=0x7f03000a;
+        public static final int enviomail=0x7f030004;
+        public static final int gallery=0x7f030005;
+        public static final int main=0x7f030006;
+        public static final int more=0x7f030007;
+        public static final int selectbonsai=0x7f030008;
+        public static final int start=0x7f030009;
+        public static final int task=0x7f03000a;
+        public static final int task_row=0x7f03000b;
     }
     public static final class menu {
         public static final int menu=0x7f060000;
+        public static final int menubonsai=0x7f060001;
     }
     public static final class string {
         public static final int app_name=0x7f040000;
diff --git a/res/drawable/disease.png b/res/drawable/disease.png
new file mode 100644
index 0000000..bd21e89
Binary files /dev/null and b/res/drawable/disease.png differ
diff --git a/res/layout/enviomail.xml b/res/layout/enviomail.xml
new file mode 100644
index 0000000..80d021b
--- /dev/null
+++ b/res/layout/enviomail.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout android:id="@+id/LinearLayout01" 
+			  android:layout_width="fill_parent"
+			  android:layout_height="fill_parent"
+			  android:orientation="vertical"
+  		      xmlns:android="http://schemas.android.com/apk/res/android">
+	<LinearLayout android:id="@+id/LinearLayout02"
+				  android:layout_width="wrap_content" 
+				  android:layout_height="wrap_content"
+ 				  android:orientation="horizontal">
+		<TextView android:text="To:          "
+				  android:layout_width="wrap_content" 
+				  android:layout_height="wrap_content" 
+				  android:id="@+id/txtForEmail"></TextView>
+
+		<TextView
+		    android:id="@+id/etEmail"
+		    android:layout_width="wrap_content"
+		    android:layout_height="wrap_content"
+		    android:text="mail Receiver" />
+
+	</LinearLayout>
+	<LinearLayout android:id="@+id/LinearLayout03"
+ 				  android:layout_width="wrap_content" 
+ 				  android:layout_height="wrap_content"
+ 				  android:orientation="horizontal">
+		<TextView android:text="Subject" 
+				  android:layout_width="wrap_content"
+				  android:layout_height="wrap_content"
+				  android:id="@+id/txtForSubject"></TextView>
+		<EditText android:layout_width="wrap_content"
+				  android:layout_height="wrap_content" 
+				  android:width="170dip" 
+				  android:id="@+id/etSubject">
+		</EditText>
+	</LinearLayout>
+	<LinearLayout android:id="@+id/LinearLayout04"
+ 				  android:layout_width="wrap_content" 
+ 				  android:layout_height="wrap_content"
+ 				  android:orientation="horizontal">
+		<TextView android:text="Menssage"
+			      android:layout_width="wrap_content" 
+			      android:layout_height="wrap_content"
+			       android:id="@+id/txtForBody"></TextView>
+		<EditText android:layout_width="wrap_content"
+ 			  android:layout_height="wrap_content" 
+ 			  android:lines="5" 
+ 			  android:width="300dip"
+			  android:id="@+id/etBody">
+		</EditText>
+	</LinearLayout>
+	<CheckBox android:text="Send attachment aplication icon" 
+			  android:id="@+id/chkAttachment" 
+			  android:layout_width="wrap_content" 
+			  android:layout_height="wrap_content"></CheckBox>
+	<Button android:layout_width="wrap_content" 
+			android:layout_height="wrap_content"
+			android:id="@+id/btnSend"
+			android:text="Send"
+			android:imeOptions="actionSend"
+			android:width="150dip">
+	</Button>
+</LinearLayout>
+
diff --git a/res/layout/more.xml b/res/layout/more.xml
index 0419479..7ddac1b 100755
--- a/res/layout/more.xml
+++ b/res/layout/more.xml
@@ -58,7 +58,7 @@
         android:textAppearance="?android:attr/textAppearanceSmall" />
 
     <Button
-        android:id="@+id/donatebutton"
+        android:id="@+id/contactbutton"
         style="?android:attr/buttonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
diff --git a/res/menu/menubonsai.xml b/res/menu/menubonsai.xml
new file mode 100644
index 0000000..440d185
--- /dev/null
+++ b/res/menu/menubonsai.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu
+  xmlns:android="http://schemas.android.com/apk/res/android">
+ 
+<item android:id="@+id/MnuOpc1" android:title="@string/menu_help"
+      android:icon="@drawable/ic_menu_help"></item>
+
+<item android:id="@+id/MnuOpc2" android:title="Disease"
+      android:icon="@drawable/disease"></item>
+</menu>
\ No newline at end of file
diff --git a/src/bonsai/app/BonsaiActivity.java b/src/bonsai/app/BonsaiActivity.java
index c0f85c5..3604fa6 100755
--- a/src/bonsai/app/BonsaiActivity.java
+++ b/src/bonsai/app/BonsaiActivity.java
@@ -305,7 +305,7 @@ public void run() {
     
     public void setTempInfo() {
     	try{
-	   		textWeather.setText(Integer.toString(w.getTempMedia())+"¼C");
+	   		textWeather.setText(Integer.toString(w.getTempMedia())+"ºC");
     	} catch (Exception e) {
     	
     	}
@@ -452,7 +452,7 @@ public void makeTransplant(View v) {
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
         MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu, menu);
+        inflater.inflate(R.menu.menubonsai, menu);
         return true;
     }
     
@@ -462,6 +462,14 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.MnuOpc1:
             	Toast.makeText(this,"Display current information about the status of your bonsai", Toast.LENGTH_LONG).show();
                 return true;
+            
+            case R.id.MnuOpc2:
+    	        Intent intent = new Intent(BonsaiActivity.this, EnvioMailActivity.class);
+    	    	Bundle bundle = new Bundle();
+    	        bundle.putString("MAIL", "globereds@gmail.com");
+    	        intent.putExtras(bundle);    	 
+    	        startActivity(intent);
+                return true;
 
             default:
                 return super.onOptionsItemSelected(item);
diff --git a/src/bonsai/app/EnvioMailActivity.java b/src/bonsai/app/EnvioMailActivity.java
new file mode 100644
index 0000000..97cdecd
--- /dev/null
+++ b/src/bonsai/app/EnvioMailActivity.java
@@ -0,0 +1,58 @@
+package bonsai.app;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.EditText;
+import android.widget.TextView;
+
+public class EnvioMailActivity extends Activity {	
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.enviomail);  
+        
+        final TextView etEmail = (TextView) findViewById(R.id.etEmail);
+        final EditText etSubject = (EditText) findViewById(R.id.etSubject);
+        final EditText etBody = (EditText) findViewById(R.id.etBody);					        
+        final CheckBox chkAttachment = (CheckBox) findViewById(R.id.chkAttachment);
+        Bundle bundle = getIntent().getExtras();
+        etEmail.setText(bundle.getString("MAIL"));
+        
+        Button btnSend = (Button) findViewById(R.id.btnSend);
+        btnSend.setOnClickListener(new OnClickListener() {                      
+						@Override
+						public void onClick(View v) {
+
+					        /* es necesario un intent que levante la actividad deseada */
+                            Intent itSend = new Intent(android.content.Intent.ACTION_SEND);
+                            
+                            /* vamos a enviar texto plano a menos que el checkbox esté marcado */
+                            itSend.setType("plain/text");
+                            
+                            /* colocamos los datos para el envio */
+                            itSend.putExtra(android.content.Intent.EXTRA_EMAIL, new String[]{ etEmail.getText().toString()});                            
+                            itSend.putExtra(android.content.Intent.EXTRA_SUBJECT, etSubject.getText().toString());
+                            itSend.putExtra(android.content.Intent.EXTRA_TEXT, etBody.getText());
+                            
+                            /* revisamos si el checkbox está marcado enviamos el icono de la aplicaci—n como adjunto */
+                            if (chkAttachment.isChecked()) {
+                            	/* colocamos el adjunto en el stream */
+                            	itSend.putExtra(Intent.EXTRA_STREAM, Uri.parse("android.resource://" + getPackageName() + "/" + R.drawable.ic_launcher));
+                            	
+                            	/* indicamos el tipo de dato */
+                            	itSend.setType("image/png");
+                            }
+                            /* iniciamos la actividad */
+                            startActivity(itSend);
+						}
+                });
+    }
+}
+
diff --git a/src/bonsai/app/MoreActivity.java b/src/bonsai/app/MoreActivity.java
index 0dc042f..c0c3ab8 100755
--- a/src/bonsai/app/MoreActivity.java
+++ b/src/bonsai/app/MoreActivity.java
@@ -1,10 +1,13 @@
 package bonsai.app;
 
+
 import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.view.View;
+import android.view.View.OnClickListener;
+import android.widget.Button;
 import android.widget.Toast;
 
 public class MoreActivity extends Activity {
@@ -17,11 +20,25 @@ public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.more);
         
+    	final Button btn = (Button)findViewById(R.id.contactbutton);
+    	
+    	btn.setOnClickListener(new OnClickListener() {
+    	    public void onClick(View arg0) {
+    	        Intent intent = new Intent(MoreActivity.this, EnvioMailActivity.class);
+    	 
+    	        Bundle bundle = new Bundle();
+    	        bundle.putString("MAIL", "raulmerlin@gmail.com ; rubevalero@gmail.com");
+    	        intent.putExtras(bundle);
+    	 
+    	        startActivity(intent);
+    	    }
+    	});
+        
         
     }
     
     public void goDonate(View v) {
-    	// Aqu’ sacar’amos el mensaje en el Toast para imprimirlo en un mensajito emergente
+    	// Aqu� sacar�amos el mensaje en el Toast para imprimirlo en un mensajito emergente
     	//Toast.makeText(this, "Donation Webpage", Toast.LENGTH_LONG).show();
     	Uri uri = Uri.parse("http://www.merlitec.com");
     	Intent intent = new Intent(Intent.ACTION_VIEW, uri);
diff --git a/src/bonsai/app/TaskActivity.java b/src/bonsai/app/TaskActivity.java
index 8303e49..f85d526 100755
--- a/src/bonsai/app/TaskActivity.java
+++ b/src/bonsai/app/TaskActivity.java
@@ -113,7 +113,7 @@ public boolean onCreateOptionsMenu(Menu menu) {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.MnuOpc1:
-            	Toast.makeText(this,"Displays the daily care of your bonsai. Press Alarm ON / OFF to enable / disable notifications for the taskbar of your device", Toast.LENGTH_LONG).show();
+            	Toast.makeText(this,"Displays the daily care of your bonsai.", Toast.LENGTH_LONG).show();
                 return true;
             default:
                 return super.onOptionsItemSelected(item);
@@ -123,7 +123,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
     
     /*
      * checkWater - Devuelve la accion a realizar respecto al riego de cierto bonsai, a partir
-     * de su ultimo riego, su frecuencia de regado y su tama–o.
+     * de su ultimo riego, su frecuencia de regado y su tama�o.
      * 
      * @param id - fila de la base de datos del bonsai a comprobar
      * @return String con la accion a realizar, o null si no hay que hacer nada.
diff --git a/src/bonsai/app/weather/Weather.java b/src/bonsai/app/weather/Weather.java
index 7104b87..aa6b38d 100755
--- a/src/bonsai/app/weather/Weather.java
+++ b/src/bonsai/app/weather/Weather.java
@@ -1,31 +1,57 @@
 package bonsai.app.weather;
 
+/*
+ * Crea instancias de Weather, objeto representado por la temperatura en una localizacion con
+ * su temperatura Maxima, minima, media y un icono del tiempo atmosferico.
+ * 
+ * @author ruben y raul
+ *
+ */
 public class Weather {
 
 	private int tempMax;
 	private int tempMin;
 	private double tempMediaC;
 	private String icon;
-
+	/**
+	 * Getter TempMax
+	 * @return temperatura maxima en Celsius
+	 */
 	public double getTempMax() {
 		double t = (tempMax - 32) / 1.8;
 		return t;
 	}
-
+	/**
+	 * Setter TempMax
+	 * @param tempMax - temperatura Maxima
+	 */
 	public void setTempMax(int tempMax) {
 		this.tempMax = tempMax;
 
 	}
-
+	
+	/**
+	 * Getter TempMin
+	 * @return temperatura minima en Celsius
+	 */
 	public double getTempMin() {
 		double t = (tempMin - 32) / 1.8;
 		return t;
 	}
-
+	
+	/**
+	 * Setter TempMin
+	 * @param tempMin - temperatura Minima
+	 */
 	public void setTempMin(int tempMin) {
 		this.tempMin = tempMin;
 	}
-
+	
+	/**
+	 * Getter de la temperatura media de una instancia de Weather
+	 * 
+	 * @return temperatura medía en Celsius
+	 */
 	public int getTempMedia() {
 		double t1 = (tempMax - 32) / 1.8;
 		System.out.println("tempMax es " + tempMax + " y en C es " + t1);
@@ -35,11 +61,17 @@ public int getTempMedia() {
 		return (int) tempMediaC;
 
 	}
-
+	/**
+	 * Getter Icon - nombre con la ruta que especifica el icono del tiempo atmosferico
+	 * @return icon
+	 */
 	public String getIcon() {
 		return icon;
 	}
-
+	/**
+	 * Setter Icon
+	 * @param icon
+	 */
 	public void setIcon(String icon) {
 		this.icon = icon;
 	}