Merge branch 'master' of github.com:flancian/garden

cryptopunks.md

@@ -0,0 +1,6 @@
+# cryptopunks
+
+- a [[project]]
+  - [[nfts]] [[2016]]
+  - [[go]] https://www.larvalabs.com/cryptopunks
+

ios.md

@@ -0,0 +1,2 @@
+# ios
+

journal/2021-11-23.md

@@ -1,4 +1,11 @@
 # 2021-11-23
 
+<<<<<<< HEAD
+- [[think tank]]
+  - [[mondegreen]] [[think thank]]
+- [[roko]]
+- [[evan]] posted nice questions I want to answer today: https://twitter.com/Scaledish/status/1462940124141047808
+=======
 - [[olof]] recommended [[the bureau]] ([[french]], [[2015]])
   - [[birthday]] today!
+>>>>>>> 1001f897e1d807404718908e4dd593b19dc36060

journal/2021-11-24.md

@@ -1,5 +1,10 @@
 # 2021-11-24
 
+- [[vera]]
+  - [[medito]]
+- TIL about [[cryptopunks]] and for some reason it depressed me a bit.
+  - [[nfts]] tend to produce this effect on me.
+  - in this case mostly the fact that the *cheapest* is currently valued at 362k USD.
 - [[push]] [[joseph goldstein]]
   - [[four reflections]] that turn our mind towards the [[dharma]]
     - [[human birth]] (and dying as the end of birth)

journal/2021-11-25.md

@@ -1,5 +1,10 @@
 # 2021-11-25
 
+<<<<<<< HEAD
 - [[push]] [[ricardo piglia]] se basa en [[benjamin]] en [[las tres vanguardias]]
   - [[experiencia y pobreza]]
   - [[el narrador]]
+=======
+- [[workitect]] told me about [[world happiness foundation]]
+  - [[luis gallardo]]
+>>>>>>> 453270d64560fbcb76b33fa3a7b367028ed1401e

luis gallardo.md

@@ -0,0 +1,6 @@
+# luis gallardo
+
+- a [[person]].
+  - [[world happiness foundation]]
+  - https://en.wikipedia.org/wiki/International_Day_of_Happiness
+

medito.md

@@ -1,4 +1,14 @@
 # Medito
 
-- A meditation app: https://twitter.com/meditoHQ.
+- an [[app]].
+  - [[meditation]] [[free]] [[open source]]
+  - [[twitter]] https://twitter.com/meditoHQ.
+  - [[go]] https://meditofoundation.org/medito-app
+    - [[android]] https://play.google.com/store/apps/details?id=meditofoundation.medito
+    - [[ios]] https://apps.apple.com/us/app/medito/id1500780518?ls=1
+- a [[foundation]].
+  - [[non profit]]
+  - [[go]] https://meditofoundation.org
+  - [[steven york]] [[?]]
+  - [[blog]] https://meditofoundation.org/blog/blog-guidelines
 

workitect.md

@@ -0,0 +1,8 @@
+# workitect
+
+- a [[person]]
+  - [[pull]] [[geordie keitt]]
+  - [[twitter]] https://twitter.com/geordiekeitt
+  - [[calendly]] https://calendly.com/geordiekeitt
+  - [[the structures of work]] https://twitter.com/geordiekeitt/status/1287743034491314176
+

world happiness foundation.md

@@ -0,0 +1,11 @@
+# world happiness foundation
+
+- a [[foundation]].
+  - [[luis gallardo]] 
+    - https://worldhappiness.foundation/who-we-are/
+  - [[non profit]]
+  - [[go]] https://worldhappiness.foundation/
+  - [[agora]] https://worldhappiness.foundation/community/become-an-agora-host/
+  - [[ebook]] https://worldhappiness.foundation/store/ebooks/realizing-a-world-with-freedom-consciousness-and-happiness-for-all/
+    - "realizing a world with freedom, consciousness and happiness for all"
+