Resolved conflict

Author: kkkkkabir

DevCGlobalDirectory.md

@@ -168,9 +168,31 @@
   - Github: 
 </details>
 
+<details>
+  <summary>
+    <b>DevC Kathmandu</b>
+  </summary>
+  
+  - Lead(s):
+    - [Chandan Thakur](https://github.com/ihackme)
+    
+  - Facebook Group: https://www.facebook.com/groups/DevCKathmandu/
+</details>
+
 
 ## India
 
+<details>
+  <summary>
+    <b>DevC Kolkata</b>
+  </summary>
+
+  - Lead(s):
+    - [Sabyasachi Mukhopadhyay](https://github.com/Sabyasachi123276)
+  - Facebook Group: https://www.facebook.com/groups/DevCKolkata
+  - GitHub: 
+</details>
+
 <details>
   <summary>
     <b>DevC Delhi NCR</b>
@@ -206,6 +228,16 @@
   - Github: https://github.com/devcpune
 </details>
 
+<details>
+  <summary>
+    <b>DevC Raipur</b>
+  </summary>
+
+  - Lead(s):
+    - [Meghal Agrawal](https://github.com/meghalagrawal)
+  - Facebook Group: https://www.facebook.com/groups/DevCRaipur
+</details>
+
 <details>
   <summary>
     <b>DevC Hyderbad</b>
@@ -258,6 +290,26 @@
   - Facebook Group: https://www.facebook.com/groups/DevCMumbai
 </details>
 
+<details>
+  <summary>
+    <b>DevC Coimbatore</b>
+  </summary>
+
+  - Lead(s):
+    - [Bharath Raj Kumar](https://github.com/brk9595)
+  - Facebook Group: https://www.facebook.com/groups/DevCCoimbatore/
+</details>
+
+<details>
+  <summary>
+    <b>DevC Trivandrum</b>
+  </summary>
+  
+  - Lead(s):
+    - [Prashanth Reddy](https://github.com/prashanth726)
+  - Facebook Group: https://www.facebook.com/groups/DevCTRV/
+</details>
+
 ## EMEA (Europe, the Middle East and Africa)
 
 <details>
@@ -330,7 +382,6 @@
   - Github: https://github.com/devcbuea
 </details>
 
-
 <details>
   <summary>
     <b>DevC Douala</b>
@@ -339,7 +390,20 @@
   - Lead(s):
     - [Herve Dzeudjouo](https://github.com/dherve19)
   - Facebook Group: https://www.facebook.com/groups/devcdouala/
+  - Github: https://github.com/Devc-Douala
 </details>
+
+<details>
+  <summary>
+    <b>DevC Yaounde</b>
+  </summary>
+
+  - Lead(s):
+    - [Aurelien Xavier](https://github.com/xavier-pay)
+    - [Suzy Tresor Tchegnelene](https://github.com/tchegnelenesuzy)
+  - Facebook Group: https://www.facebook.com/groups/1216588391854380/
+</details>
+
 <details>
   <summary>
     <b>DevC Owerri</b>
@@ -352,7 +416,6 @@
   - Github: https://github.com/fbdevcowerri
 </details>
 
-
 <details>
   <summary>
     <b>DevC Algiers</b>
@@ -364,6 +427,41 @@
   - Github: https://github.com/fb-devc-algiers
 </details>
 
+<details>
+  <summary>
+    <b>DevC Tunis</b>
+  </summary>
+
+  - Lead(s):
+    - [Faten Ghriss](https://github.com/fatenghriss)
+  - Facebook Group: https://www.facebook.com/groups/DevCTunis
+  - Github: https://github.com/Facebook-DevC-Tunis
+</details>
+
+
+<details>
+  <summary>
+    <b>DevC Eldoret</b>
+  </summary>
+
+  - Lead(s):
+    - [Gertie Sheshe](https://github.com/gertie-sheshe)
+    - [Fatma M. Ali](https://github.com/fatmali)
+  - Facebook Group: https://www.facebook.com/groups/DevCEldoret
+  - Github: https://github.com/DevCEldoret
+</details>
+
+<details>
+  <summary>
+    <b>DevC Nairobi</b>
+  </summary>
+
+  - Lead(s):
+    - [Eddie Kago](https://github.com/scripttie)
+    - Carol Kariuki
+  - Facebook Group:https://www.facebook.com/groups/devcnairobi
+</details>
+
 
 ## Template
 

README.md

@@ -22,9 +22,7 @@
   </a>
 </p>
 
-<h3 align="center">
-  <a href="https://www.developercircleresources.com/learningPath/open-source">Getting Started</a>
-  <span> · </span>
+<h3 align="center">  
   <a href="https://www.developercircleresources.com/learningPath/open-source">Learn the Basics</a>
   <span> · </span>
   <a href="https://github.com/fbdevelopercircles/FbDevcCommunityContent/blob/master/CONTRIBUTING.md">Contribute</a>
@@ -54,6 +52,7 @@
 Useful workshop materials.
 
 - [Git training kit](https://github.github.com/training-kit/)
+- [Github Learning Lab](https://lab.github.com/)
 - [Basic Javascript](https://github.com/bpesquet/thejsway)
 - [React Router](https://github.com/DevCBali/react-router-workshop) \*Bahasa Indonesia
 - [Frontend Workshop from HTML/CSS/JS to TypeScript/React/Redux](https://github.com/microsoft/frontend-bootcamp)
@@ -69,6 +68,7 @@ Useful workshop materials.
 
 Useful articles and learning resources.
 
+- [Awesome Developer Resources](https://nelsonmichael.dev/awesome-developer-resources-ckcrin0gg00khpms1gbue38dz)
 - [DevC Resources CMS](https://developercircleresources.com/)
 - [5 Steps to Overcoming Deployment Anxiety with Error Monitoring](https://scotch.io/bar-talk/5-steps-to-overcoming-deployment-anxiety-with-error-monitoring)
 - [5 Reasons Why You Should Find the Time for Mentoring](https://mmaksimovic.dev/5-reasons-why-you-should-find-the-time-for-mentoring-cju3tarp4007gqcs19cxysfo7)
@@ -100,6 +100,8 @@ Useful articles and learning resources.
 - [Front-end Developer Handbook](https://thoughtworksinc.github.io/front-end-handbook/en/index.html)
 - [Prepare for your next interview](https://github.com/Nabagata/interview-prep)
 - [The Deno Handbook](https://flaviocopes.com/deno/)
+- [Why you should be using JAMSTACK](https://blog.logrocket.com/why-you-should-be-using-jamstack/)
+
 </details>
 
 <details>
@@ -114,7 +116,14 @@ Useful articles and learning resources.
 - [Free Code Camp](https://www.freecodecamp.org) - Software development related posts
 - [CSS Tricks](https://css-tricks.com) - CSS related posts
 - [DEV.to](https://dev.to) - The All in One Blogs Portal for Developers
+<<<<<<< HEAD
 - [The modern way to learn javascript](https://javascript.info/) - A great place to learn javascript in an easy and understandable way
+=======
+- [LogRocket Blog](https://blog.logrocket.com/) - For Frontend Developers and Web App Engineers
+- [Hashnode](https://hashnode.com/) - A one-stop platform to start blogging as a developer.
+- [Codepen Blog](https://blog.codepen.io/) - A blog about the ins and outs of running a web software business.
+- [Airbnb Engineering Blog](https://airbnb.io/) - A blog about Airbnb's Engineering and Data Science Structure
+>>>>>>> upstream/master
 </details>
 
 <details>
@@ -134,12 +143,16 @@ Useful articles and learning resources.
 - [Postman](https://www.getpostman.com/) - The Collaboration Platform for API Development
 - [StaticKit](https://statickit.com/) - Form Hosting for JAMstack Sites
 - [Vercel](https://vercel.com/) - The easiest way to deploy websites
+- [Babel](https://babeljs.io/) - A JS compiler and toolchain to convert ECMAScript 2015+ code into a backwards compatible version of JavaScript in current and older browsers or environments.
 - [Disqus](https://disqus.com/) - Blog comment hosting service for your JAMstack sites
 - [NetlifyCMS](https://www.netlifycms.org/) - Headless CMS content management for your Git workflow
 - [Carbon](https://carbon.now.sh/) - Create and share beautiful images of your source code.
 - [Parcel](https://parceljs.org/) - Blazing fast, zero configuration web application bundler
 - [Emotion](https://emotion.sh/docs/introduction) - A CSS-in-JS library that promises users a high level of performance and flexibility.
 - [Create React App](https://github.com/facebook/create-react-app) - Create React apps with no build configurations.
+- [Swagger](https://swagger.io/) - Design and document APIs compatible with OpenAPI specification.
+- [StackEdit](https://stackedit.io/) - In-browser Markdown editor
+
 </details>
 
 <details>
@@ -149,6 +162,7 @@ Useful articles and learning resources.
 
 <br />
 
+- [The Clean Coder](https://www.goodreads.com/book/show/10284614-the-clean-coder), by Robert C. Martin
 - [Clean Code](https://www.goodreads.com/book/show/3735293-clean-code), by Robert C. Martin
 - [The Pragmatic Programmer](https://www.goodreads.com/book/show/4099.The_Pragmatic_Programmer), by Andy Hunt, Dave Thomas
 - [Cracking the Coding Interview](https://www.goodreads.com/book/show/12544648-cracking-the-coding-interview), by Gayle Laakmann McDowell
@@ -157,10 +171,15 @@ Useful articles and learning resources.
 - [The Developer's Guide to Creating a Successful Blog](https://gumroad.com/l/successfulblog), by Flavio Copes
 - [Technical Writing for Dummies](http://www.amazon.co.uk/Technical-Writing-Dummies-Sheryl-Lindsell-Roberts/dp/0764553089/), by Sheryl Lindsell-Roberts
 - [The Handbook of Technical Writing](https://www.amazon.com/dp/1457675528), by Gerald J. Alre
-- [You Dont Know JS](https://github.com/getify/You-Dont-Know-JS/blob/1st-ed/README.md), by Kyle Simpson
+- [You Dont Know JS](https://github.com/getify/You-Dont-Know-JS/blob/2nd-ed/README.md), by Kyle Simpson
 - [JavaScript: The Good Parts](https://www.oreilly.com/library/view/javascript-the-good/9780596517748/)
-</details>
+- [Eloquent JavaScript Modern Introduction Programming](https://eloquentjavascript.net/), by Marijn Haverbeke
+- [Cracking the Code to a Successful Interview](https://www.amazon.com/Cracking-Code-Successful-Interview-Top-Level/dp/1504760883), by Evan Pellett
+- [Guide to Competitive Programming](https://www.pdfdrive.com/guide-to-competitive-programming-learning-and-improving-algorithms-through-contests-e187746875.html), by Antti Laaksonen
+- [Pure React: Learn to think in React](https://purereact.com/), by Dave Ceddia
 
+- [Starting out with Python](https://www.pearson.com/us/higher-education/program/Gaddis-Starting-Out-with-Python-plus-My-Lab-Programming-with-Pearson-e-Text-Access-Card-Package-3rd-Edition/PGM9873.html?tab=contents), by Tony Gaddis
+</details>
 <details>
   <summary>
     📺 Videos
@@ -180,6 +199,7 @@ Useful articles and learning resources.
 - [CS50 Lectures 2019](https://www.youtube.com/playlist?list=PLhQjrBD2T381L3iZyDTxRwOBuUt6m1FnW), by David J. Malan
 - [Streamelopers](http://bit.ly/streamelopersub) Community tech talks in spanish
 - [Top 10 Best VS Code Extensions for developers](https://www.youtube.com/watch?v=c5GAS_PMXDs),by codeSTACKr
+- [Learn React JS](https://www.youtube.com/watch?v=DLX62G4lc44), a full course for beginners by freeCodeCamp.org
 </details>
 
 <details>
@@ -189,7 +209,7 @@ Useful articles and learning resources.
 
 <br />
 
-- [The Diff](https://thediffpodcast.com/) - The Diff showcases the program, the projects and the people that drive th mission of building open source community.
+- [The Diff](https://thediffpodcast.com/) - The Diff showcases the program, the projects and the people that drive the mission of building open source community.
 - [Software Engineering Daily](https://softwareengineeringdaily.com/) - Features daily interviews about technical software topics.
 - [JAMstack Radio](https://www.netlify.com/tags/podcast/) - Exploring the Jamstack, static sites, and the future of Web Development.
 - [Syntax.fm](https://syntax.fm/) - A Tasty Treats podcast for Web Developers.
@@ -202,8 +222,12 @@ Useful articles and learning resources.
 - [GraphQL Radio](https://graphqlradio.com/) - About the GraphQL ecosystem. Monthly talks with experienced developers and experts.
 - [Front End Happy Hour](https://frontendhappyhour.com/) - Featuring of engineers from Netflix, Twitch, & Atlassian talking things Front End development.
 - [Go Figure](https://gofigure.go-jek.com/) - A podcast discussing the inner workings of tech companies.
+- [The Stack Overflow Podcast](https://stackoverflow.blog/podcast/) - The Stack Overflow Podcast is a twice-weekly conversation about working in software development, learning to code, and the art and culture of computer programming.
+- [Google Cloud Platform Podcast](https://www.gcppodcast.com/) - Weekly updates on Cloud Platform professionals, answer some of your burning questions, and introduce you to cool new things!
 - [Artificial Intelligence: AI Podcast](https://lexfridman.com/ai/) - A series of conversations about technology, science, and the human condition.
 - [Software Engineering](https://www.se-radio.net/) - A podcast targeted at the professional software developer managed by the volunteers and staff of IEEE Software.
+- [The Changelog](https://changelog.com/podcast)- The Changelog mainly discusses topics related to open source software.
+- [This Developer's Life](https://daraoladapo.com/thisdevlife/) - A Podcast about developer work and life balance.
 </details>
 
 <details>
@@ -215,11 +239,15 @@ Useful articles and learning resources.
 
 Useful fun activities that can be done at the meetup/events/activities.
 
+- [Git reference tool](https://ohshitgit.com/) - FAQ site for Git commands.
 - [Kahoot](https://kahoot.com/) - Kahoot! brings engagement and fun to your events and makes learning awesome.
 - [Wheel Of Names](https://wheelofnames.com/) - Random name picker with Wheel Of Fortunes style animation.
 - [AirConsole](https://www.airconsole.com/) - Multiplayer browser games with your smartphones as the gamepads.
 - [Gartic](https://gartic.io/) - Pictionary-inspired games that can be played online
-- [Mentimeter](https://www.mentimeter.com/) - Mentimeter is a goodway to engage the community live and understand them using it's analytical dashboard.
+- [DevSwag](https://devswag.io/) - FREE Swag for developers!
+- [Mentimeter](https://www.mentimeter.com/) - Mentimeter is a good way to engage the community live and understand them using it's analytical dashboard.
+- [QuizBreaker](https://www.quizbreaker.com/) - A scheduled virtual team building quiz delivered in inbox. Can be a good ice breaker.
+- [TypeRacer](https://play.typeracer.com/) - TypeRacer is a fun way to engage people during a meetup while improving their typing skills.
 </details>
 
 ## License