Merge branch 'master' of https://bitbucket.org/acorbi/scopesessions.org

# Conflicts:
#	_posts/session/2018-11-08-077.markdown
#	_site/about/index.html
#	_site/artists/index.html
#	_site/feed.json
#	_site/feed.xml
#	_site/index.html
#	_site/newsletter_content/index.html
#	_site/session/2018/11/08/077.html
#	_site/video/index.html
#	_site/video_fullscreen/index.html

_site/feed.json

@@ -1,19 +1,53 @@
 [
   
   {
+<<<<<<< HEAD
     "title": "Cyborgian Spaces",
     "description": "During her presentation, she will discuss her work with the curator and art historian Johanna Hohage (Berlin), whose research is focused on art and feminism, technology and new medias.",
     "artist": "Kate Danyu Chen",
     "talk_video_url": "",    
     "topics": "cyborg, feminism, performance, installation"
+=======
+    "title": "Phygital Immersive Experiences",
+    "description": "For Scope #78 INNATIVE LAB will introduce their artistic research on the phenomenon of interconnection between humans and with nature, focused on the study of ancestral practices and the use of cutting-edge sensing technologies. An insight into the interdisciplinarity within the combination of Neuroscience, Visual Arts and Performance Art.",
+    "artist": "Innative Lab",
+    "talk_video_url": "",    
+    "topics": "nature"
+  },
+  
+  {
+    "title": "The Complaints Department",
+    "description": "The talk will cover transitions, New Work und die Zukunft!****CONTENT WARNING FOR THIS TALK**** Some content may trigger mental health issues, cause epilepsy and/or offend viewers sensitive to pornographic, stroboscopic, psychedelic or traumatic audio visual material.",
+    "artist": "Matt Gingold (aka Helen Back aka gameover/hack)",
+    "talk_video_url": "",    
+    "topics": "audiovisual"
+  }
+  
+  ,
+
+  
+  {
+    "title": "Cyborgian Spaces",
+    "description": "Currently, her research focuses on Donna Haraway’s post-humanist concept of the 'cyborg' as a synthesis of dualisms — human/machine, male/female, natural/artificial, virtual/real — to critically reconstruct an understanding of being and consciousness. She recently took part to the exhibition « Un_becoming: The Erotic, the Body & technology » in SomoS Art Gallery in the context of the Berlin Pornfilm Festival 2018 and presented there the Installation/Video piece «Offline Venus : Memories and myths of the Cyborg».",
+    "artist": "Kate Danyu Chen",
+    "talk_video_url": "",    
+    "topics": "CYborg"
+>>>>>>> 1f73d0f078cc399e14b6596f6e4862c4f84a2d0c
   },
   
   {
     "title": "Four-Dimensional Sound Choreographies",
+<<<<<<< HEAD
     "description": "Mila Chiral will talk about her music, her transdisciplinary artworks and collaborations. In selected examples she will give an insight to her artistic approach and techniques, including her artistic background from dance/choreography to electronic music and interdisciplinary art forms such as digital arts. At the end of the talk, Mila Chiral will show as a premiere the brand-new video directed by Faulty Agatha by Was Deferenz to her track 'Stars & Flowers' from the album 'WHERE TIME MEETS SPACE' (2017).",
     "artist": "Mila Chiral",
     "talk_video_url": "",    
     "topics": "music, dance"
+=======
+    "description": "Mila Chiral is part of minutektiv, a group of female* music producers from Berlin, and of the transdisciplinary art collective WAH (Weber / Anderson / Helschinger) in which she performs with dance, voice, acoustic soundscapes, electronic music, poetry and elements from visual arts, questioning the inherent relationship of existential and artistic freedom. Mila Chiral is also one of the organizers of MEETUP Berlin, a new and growing community of female-identifying, trans and non-binary artists in the fields of electronic music and arts and a member of female:pressure.",
+    "artist": "Mila Chiral",
+    "talk_video_url": "",    
+    "topics": "Electronic music"
+>>>>>>> 1f73d0f078cc399e14b6596f6e4862c4f84a2d0c
   }
   
   ,