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

# Conflicts:
#	age.c

age.c

@@ -1,5 +1,10 @@
 #include "age.h"
+
 void setAge(uint8_t age)
 {
 	g_age = age;
+}
+uint8_t getAge(void)
+{
+	return g_age;
 }