diff --git a/cryptopunks.md b/cryptopunks.md
new file mode 100644
index 000000000..8789c129c
--- /dev/null
+++ b/cryptopunks.md
@@ -0,0 +1,6 @@
+# cryptopunks
+
+- a [[project]]
+  - [[nfts]] [[2016]]
+  - [[go]] https://www.larvalabs.com/cryptopunks
+
diff --git a/ios.md b/ios.md
new file mode 100644
index 000000000..3c8fe1121
--- /dev/null
+++ b/ios.md
@@ -0,0 +1,2 @@
+# ios
+
diff --git a/journal/2021-11-23.md b/journal/2021-11-23.md
index e4f25e265..7c6c88425 100644
--- a/journal/2021-11-23.md
+++ b/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!
\ No newline at end of file
+  - [[birthday]] today!
+>>>>>>> 1001f897e1d807404718908e4dd593b19dc36060
diff --git a/journal/2021-11-24.md b/journal/2021-11-24.md
index 29c86ca0c..d49078c19 100644
--- a/journal/2021-11-24.md
+++ b/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)
diff --git a/journal/2021-11-25.md b/journal/2021-11-25.md
index 8c9a57c7d..ef01ff5e2 100644
--- a/journal/2021-11-25.md
+++ b/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]]
\ No newline at end of file
+  - [[el narrador]]
+=======
+- [[workitect]] told me about [[world happiness foundation]]
+  - [[luis gallardo]]
+>>>>>>> 453270d64560fbcb76b33fa3a7b367028ed1401e
diff --git a/luis gallardo.md b/luis gallardo.md
new file mode 100644
index 000000000..3d2b0ca58
--- /dev/null
+++ b/luis gallardo.md	
@@ -0,0 +1,6 @@
+# luis gallardo
+
+- a [[person]].
+  - [[world happiness foundation]]
+  - https://en.wikipedia.org/wiki/International_Day_of_Happiness
+
diff --git a/medito.md b/medito.md
index a19dbb418..a65e1ba49 100644
--- a/medito.md
+++ b/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
 
diff --git a/workitect.md b/workitect.md
new file mode 100644
index 000000000..6cd8911b9
--- /dev/null
+++ b/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
+
diff --git a/world happiness foundation.md b/world happiness foundation.md
new file mode 100644
index 000000000..8054663aa
--- /dev/null
+++ b/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"
+