Merge branch 'master' of http://183.238.195.77:10081/dylan/testTelpo

# Conflicts:
#	age.c

age.c

@@ -6,5 +6,9 @@ void setAge(uint8_t age)
 }
 uint8_t getAge(void)
 {
+<<<<<<< HEAD
 	return g_age+2;
+=======
+	return g_age+1;
+>>>>>>> eaed4014ac38e524085ca2b65097b2cd05ca2ebe
 }