Merge branch 'master' into esecfse21

Author: pmbittner

INSTALL.md

@@ -1,7 +1,7 @@
 ## Installation Instructions
 
 As explained in the [REQUIREMENTS.md](REQUIREMENTS.md), the [_Stack_][stack] build system is our only installation requirement.
-You can install it yourself or use the [Dockerfile](Dockerfile).
+You can install it and run the demo yourself (option 1) or use the [Dockerfile](Dockerfile) (option 2).
 
 ### Option 1: Manual Setup
 First, please install Stack.