moved conference

README.md

@@ -19,7 +19,7 @@ All files including the readings are published as releases (see the releases-but
         - [12 November: Science in context II (day4)](#12-november-science-in-context-ii-day4)
         - [25. November: Critical perspectives I  (day 5)](#25-november-critical-perspectives-i--day-5)
         - [26 November: Critical perspectives II  (day 6)](#26-november-critical-perspectives-ii--day-6)
-        - [06. December: Conference](#06-december-conference)
+        - [13. December: Conference](#13-december-conference)
 
 <!-- markdown-toc end -->
 
@@ -42,7 +42,7 @@ Professor Thomas Berker (responsible for the course: thomas.berker@ntnu.no), Pro
 
 All meetings (except the conference) are at room 8563 (which is somewhat hidden - walk through the library at Dragvoll until you reach the end, then turn to the left).
 
-The conference will take place at room D107.
+The conference will take place at room D7.
 
 ### Credit points
 
@@ -244,6 +244,6 @@ Browse through the NESH guidelines, available in both Norwegian: https://www.for
 - Berker, Thomas. “Negotiating research norms between academic and industrial research. The case of a research centre on zero emission buildings in Norway”, to be published in Nordic Architectural Research. ([here](https://learn.kultwiki.net/thomas/TOS/src/branch/main/Readings/Day%205+6:%20Critical%20perspectives/Berker_Negotiating_research_norms.pdf))
 
 
-### 06. December: Conference
+### 13. December: Conference
 
 The participants of the course present papers on how their PhD work relates to the topics of the course. The conference is public and will be organised collectively.