Merge branch 'master' of github.com:VancouverBitdevs/VancouverBitdevs.github.io into 2023-05-25-vancouver-socratic-13

Author: Liongrass

_posts/2023-03-30-vancouver-socratic-11.md

@@ -86,7 +86,10 @@ Announcing the [Pacific Nodewest](https://amboss.space/community/4a8adb4b-3c42-4
 
 ### 2023 (Central) Banking Crisis
 
+<<<<<<< HEAD
+=======
 - [How it's made: Ameridollars](https://fedguy.com/ameridollars/)
+>>>>>>> 2ca40a8d0bc1137c458c95045e9a397819e3c5ce
 - [America’s banks are missing hundreds of billions of dollars](https://www.economist.com/finance-and-economics/2023/03/21/americas-banks-are-missing-hundreds-of-billions-of-dollars)
 - [The US bank system is more fragile than you’d think](https://www.ft.com/content/84c4446a-d7aa-4f70-a286-adeb4fc4988c)
 - [Signature Bank’s Crypto Execution](https://www.wsj.com/articles/signature-banks-crypto-execution-c707bb48)
@@ -103,8 +106,11 @@ Announcing the [Pacific Nodewest](https://amboss.space/community/4a8adb4b-3c42-4
   - [Shakepay shuts down Earn](https://www.reddit.com/r/shakepay/comments/11eg4mk/goodbye_to_shakepay_earn/)
   - [Paxful shuts down in Canada](https://www.reddit.com/r/paxful/comments/11dmkos/comment/ja9pf2z/)
   - [Mempool 2.5.0 released](https://twitter.com/mempool/status/1640715797097246723)
+<<<<<<< HEAD
+=======
   - [Seedsigner Open Source Hardware Wallet](https://seedsigner.com/)
   - [Bitcoin Inheritance Planning](https://nunchuk.io/blog/multiple-beneficiaries-and-local-currency)
+>>>>>>> 2ca40a8d0bc1137c458c95045e9a397819e3c5ce
 
 
 ## Events and Podcasts

cities.md

@@ -23,6 +23,7 @@ This format has since spread all around the world, including Vancouver. We encou
 - [Honolulu](http://www.honolulubitdevs.com/)
 - [Los Angeles](https://bitdevsla.org/)
 - [Miami](https://miamibitdevs.org/)
+- [Nashville](https://nashbitdevs.org/)
 - [Raleigh / Durham / Chapel Hill](https://trianglebitdevs.org/)
 - [San Francisco](https://www.sfbitcoindevs.org/)
 - [Tampa](https://tampabitdevs.io/)
@@ -31,6 +32,14 @@ This format has since spread all around the world, including Vancouver. We encou
 ### Overseas
 
 - [Amsterdam](https://bitdevsamsterdam.org/)
+<<<<<<< HEAD
+=======
+- [Athens](https://bitdevs-athens.com/)
+- [Berlin](https://bitdevs.berlin/)
+- [London](https://londonbitdevs.org/)
+- [Melbourne](https://github.com/MelbourneBitDevs/MelbBitDevs/)
+- [São Paulo](https://saopaulobitdevs.org/)
+>>>>>>> 2ca40a8d0bc1137c458c95045e9a397819e3c5ce
 - [Berlin](https://bitdevs.berlin/)
 - [London](https://londonbitdevs.org/)
 - [São Paulo](https://bitdevsportugues.org/)

map.md

@@ -20,10 +20,11 @@ We love Bitcoin, we love earning Bitcoin and we love spending Bitcoin. Below you
 
 #### Restaurants, Cafes & Bars:
 
+- **NEW [Big Bite Donair](https://bigbitedonair.ca/)**: Kebaps
+- **NEW [Caffe Artigiano](https://caffeartigiano.com/)**: Coffee and snacks
 - [Corduroy](https://www.corduroyrestaurant.com/): Pizza & beer
 - **NEW [Milano Coffee](https://www.milanocoffee.ca/)**: Coffee and tea
 - [The Laughing Bean Coffee](https://www.laughingbeancoffee.com/): Coffee and baked delicacies
-- [The Loft on Denman](https://loftondenman.com/): Carribbean specialties
 
 #### Miscallaneous