reduced image size for demo
Merge branch 'master' of https://github.com/nfollin/SoftwareParadigmsProject