Merge branch 'master' into 'master'

# Conflicts:
#   hopes-and-dreams/henrik.md

hopes-and-dreams/henrik.md

@@ -6,5 +6,8 @@ At the moment I'm spending some time thinking about objects and *Materialität*
 
 They're just faint ideas but I think it would be interesting to do some thinking regarding these topics.
 
-
 Trying out forking
+
+Testing out how branching works.
+
+//editing inline to keep both of it (I think)
\ No newline at end of file