Merge branch 'master' of git-st.inf.tu-dresden.de:rosi/parallel-rsync

README.md

-# Role-based Runtime Model Synchronization (Running Example)
+# Resolving Conflicts in Role-based Multimodel-Synchronization
 
 Supplementary material for the [COP 2021](https://conf.researchr.org/track/ecoop-issta-2021/ecoop-issta-2021-cop) publication *"Resolving Synchronization Conflicts in Role-based Multimodel-Synchronization Environments"* by Sebastian Ebert, Tim Kluge , Sebastian Götz, Uwe Aßmann and Christopher Werner.
 
@@ -13,7 +13,7 @@ This project is based on Maven, thus building it is simple:
 3. run mvn -compile
 4. run mvn -package
 
-## Setting UP IntelliJ
+## Setting up IntelliJ
 
 1. Install IntelliJ's Plugin for Scala-Support
 2. Clone this maven project