Merge branch 'foo'
[faros-demo] / Makefile
2018-10-01 Eleni Maria Steafaros initial commit