Merge pull request #235 from reactjs/sync-23d03a85

Sync with reactjs.org @ 23d03a8

Author: Ryan-LT

content/community/conferences.md

@@ -12,11 +12,6 @@ Bạn có biết về hội nghị React.js ở địa phương hay khu vực c
 
 ## Upcoming Conferences {#upcoming-conferences}
 
-### render(ATL) 2021 {#render-atlanta-2021} 
-September 13-15, 2021. Atlanta, GA, USA
-
-[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl)
-
 ### React Brussels 2021 {#react-brussels-2021} 
 October 15, 2021 - remote event
 
@@ -38,7 +33,7 @@ November 3-4, 2021 - remote event
 
 [Website](https://geekle.us/react) - [LinkedIn](https://www.linkedin.com/events/javascriptglobalsummit6721691514176720896/) 
 
-## React Advanced London 2021 {#react-advanced-2021} 
+### React Advanced London 2021 {#react-advanced-2021} 
 October 20-22, 2021. London, UK & remote
 
 [Website](https://reactadvanced.com) - [Twitter](https://twitter.com/reactadvanced)
@@ -50,6 +45,11 @@ November 12-14, 2021 - remote event
 
 ## Past Conferences {#past-conferences}
 
+### render(ATL) 2021 {#render-atlanta-2021} 
+September 13-15, 2021. Atlanta, GA, USA
+
+[Website](https://renderatl.com) - [Twitter](https://twitter.com/renderATL) - [Instagram](https://www.instagram.com/renderatl/) - [Facebook](https://www.facebook.com/renderatl/) - [LinkedIn](https://www.linkedin.com/company/renderatl)
+
 ### React Native EU 2021 {#react-native-eu-2021}
 September 1-2, 2021 - remote event
 

content/community/team.md

@@ -46,6 +46,14 @@ Dan got into programming after he accidentally discovered Visual Basic inside Mi
 
 Luna learned programming because she thought it meant creating video games. Instead, she ended up working on the Pinterest web app, and now on React itself. Luna doesn't want to make video games anymore, but she plans to do creative writing if she ever gets bored.
 
+### Marco Salazar {#marco-salazar}
+
+![Marco](../images/team/salazarm.jpeg)
+
+[@salazarm on GitHub](https://github.com/salazarm) · [@BkOptimism on Twitter](https://twitter.com/BkOptimism)
+
+Marco's first programming language was Assembly because he could use it to hack video games. Now online games are much more secure so he settles for playing fairly (mostly). In his spare time he plays games on his treadmill desk and makes art that he never finishes. Hopefully his PRs don't have the same fate.
+
 ### Rachel Nabors {#rachel-nabors}
 
 ![Rachel](../images/team/rnabors.jpg)