Remove large file
Merge branch 'master' of github.com:CloudScale-Project/Showcase

Conflicts:
	distributed-jmeter/README.md
Fixes
Minor fixes
Conflict
Fixes