Merge branch 'master' of ssh://sunjammer.codewiz.org/~/wiki/git/wiki

Conflicts:
	beertarium

diff --git a/BodyMeasures b/BodyMeasures
index e4fd97642aeed4af3934ccea2116922a454bc777..380668511034ca6ca03dd01e352dd38bdf360b8b 100644 (file)
--- a/BodyMeasures
+++ b/BodyMeasures
@@ -25,9 +25,9 @@ Back off, pervs! This information is just for someone who wants to buy me clothe
 || Diastolic         ||  mmHg  ||    60-80   ||         74 ||         60 ||
 || Pulse rate        ||   bmp  ||            ||         72 ||            ||
 || ---               ||        ||            ||            ||            ||
-|| Diabetes          || mg/dL  ||   70-100   ||            ||         90 ||
-|| Cholesterol       || mg/dL  ||  140-200   ||            ||        186 ||
-|| Trigliceride      || mg/dL  ||   40-140   ||            ||        118 ||
+|| Diabetes          || mg/dl  ||   70-100   ||            ||         90 ||
+|| Cholesterol       || mg/dl  ||  140-200   ||            ||        186 ||
+|| Triglicerid       || mg/dl  ||   40-140   ||            ||        118 ||
 
 === Weight history ===
 || 2007-05-05 || 68 ||

diff --git a/beertarium b/beertarium
index 91601efed4a034d82faa2be48c6b48e1104cbaac..0b65ccfc32516ff4001424a302e61cd88be4cedf 100644 (file)
--- a/beertarium
+++ b/beertarium
@@ -2,12 +2,13 @@
 
  * --Spunges for plates--
  * --Bathroom mats--
- * Trash bins
+ * --Trash bins--
  * --AP--
-
-== Accounting ==
+ * Couch
+ * Microwave?
 
 
+== Accounting ==
 
 || **Date** || **Concepto**      || **Monto**  ||
 || Mar 99   || Rent March?       || -1.050.000 ||